From python-checkins at python.org  Thu Nov  1 00:03:33 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 00:03:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_check_return_v?=
 =?utf-8?q?alue_of_=5FPyUnicode=5FAsString?=
Message-ID: <3XsQ850RQhzPbJ@mail.python.org>

http://hg.python.org/cpython/rev/6964a9b6c1ea
changeset:   80141:6964a9b6c1ea
branch:      3.3
parent:      80120:4b842da2b0ac
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 19:01:42 2012 -0400
summary:
  check return value of _PyUnicode_AsString

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


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1202,12 +1202,14 @@
         asdl_seq *seq = s->v.Global.names;
         for (i = 0; i < asdl_seq_LEN(seq); i++) {
             identifier name = (identifier)asdl_seq_GET(seq, i);
-            char *c_name = _PyUnicode_AsString(name);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
                 return 0;
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
+                char *c_name = _PyUnicode_AsString(name);
+                if (!c_name)
+                    return 0;
                 if (cur & DEF_LOCAL)
                     PyOS_snprintf(buf, sizeof(buf),
                                   GLOBAL_AFTER_ASSIGN,
@@ -1229,12 +1231,14 @@
         asdl_seq *seq = s->v.Nonlocal.names;
         for (i = 0; i < asdl_seq_LEN(seq); i++) {
             identifier name = (identifier)asdl_seq_GET(seq, i);
-            char *c_name = _PyUnicode_AsString(name);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
                 return 0;
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
+                char *c_name = _PyUnicode_AsString(name);
+                if (!c_name)
+                    return 0;
                 if (cur & DEF_LOCAL)
                     PyOS_snprintf(buf, sizeof(buf),
                                   NONLOCAL_AFTER_ASSIGN,

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

From python-checkins at python.org  Thu Nov  1 00:03:34 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 00:03:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4z?=
Message-ID: <3XsQ8630XjzPbJ@mail.python.org>

http://hg.python.org/cpython/rev/9c2df50b4fe0
changeset:   80142:9c2df50b4fe0
parent:      80121:1698d1ab0b0a
parent:      80141:6964a9b6c1ea
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 19:01:48 2012 -0400
summary:
  merge 3.3

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


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1202,12 +1202,14 @@
         asdl_seq *seq = s->v.Global.names;
         for (i = 0; i < asdl_seq_LEN(seq); i++) {
             identifier name = (identifier)asdl_seq_GET(seq, i);
-            char *c_name = _PyUnicode_AsString(name);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
                 return 0;
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
+                char *c_name = _PyUnicode_AsString(name);
+                if (!c_name)
+                    return 0;
                 if (cur & DEF_LOCAL)
                     PyOS_snprintf(buf, sizeof(buf),
                                   GLOBAL_AFTER_ASSIGN,
@@ -1229,12 +1231,14 @@
         asdl_seq *seq = s->v.Nonlocal.names;
         for (i = 0; i < asdl_seq_LEN(seq); i++) {
             identifier name = (identifier)asdl_seq_GET(seq, i);
-            char *c_name = _PyUnicode_AsString(name);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
                 return 0;
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
+                char *c_name = _PyUnicode_AsString(name);
+                if (!c_name)
+                    return 0;
                 if (cur & DEF_LOCAL)
                     PyOS_snprintf(buf, sizeof(buf),
                                   NONLOCAL_AFTER_ASSIGN,

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

From python-checkins at python.org  Thu Nov  1 00:03:36 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 00:03:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_merge_heads?=
Message-ID: <3XsQ880vyMzPh0@mail.python.org>

http://hg.python.org/cpython/rev/3c249adc78aa
changeset:   80143:3c249adc78aa
branch:      3.3
parent:      80141:6964a9b6c1ea
parent:      80134:f3dd84feeb58
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 19:02:18 2012 -0400
summary:
  merge heads

files:
  Doc/library/decimal.rst |   21 +-
  Doc/library/profile.rst |  231 +++++++++++++++------------
  Lib/test/test_bisect.py |    2 +-
  3 files changed, 146 insertions(+), 108 deletions(-)


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -750,12 +750,21 @@
 
    .. method:: remainder_near(other[, context])
 
-      Compute the modulo as either a positive or negative value depending on
-      which is closest to zero.  For instance, ``Decimal(10).remainder_near(6)``
-      returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``.
-
-      If both are equally close, the one chosen will have the same sign as
-      *self*.
+      Return the remainder from dividing *self* by *other*.  This differs from
+      ``self % other`` in that the sign of the remainder is chosen so as to
+      minimize its absolute value.  More precisely, the return value is
+      ``self - n * other`` where ``n`` is the integer nearest to the exact
+      value of ``self / other``, and if two integers are equally near then the
+      even one is chosen.
+
+      If the result is zero then its sign will be the sign of *self*.
+
+      >>> Decimal(18).remainder_near(Decimal(10))
+      Decimal('-2')
+      >>> Decimal(25).remainder_near(Decimal(10))
+      Decimal('5')
+      >>> Decimal(35).remainder_near(Decimal(10))
+      Decimal('-5')
 
    .. method:: rotate(other[, context])
 
diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -240,11 +240,12 @@
         43/3    0.533    0.012    0.749    0.250 pobject.py:99(evaluate)
        ...
 
-   The first line indicates that 2706 calls were monitored.  Of those calls, 2004
-   were :dfn:`primitive`.  We define :dfn:`primitive` to mean that the call was not
-   induced via recursion. The next line: ``Ordered by: standard name``, indicates
-   that the text string in the far right column was used to sort the output. The
-   column headings include:
+   The first line indicates that 2706 calls were monitored.  Of those
+   calls, 2004 were :dfn:`primitive`.  We define :dfn:`primitive` to
+   mean that the call was not induced via recursion. The next line:
+   ``Ordered by: standard name``, indicates that the text string in
+   the far right column was used to sort the output. The column
+   headings include:
 
    ncalls
       for the number of calls,
@@ -266,14 +267,14 @@
    filename:lineno(function)
       provides the respective data of each function
 
-   When there are two numbers in the first column (for example, ``43/3``), then the
-   latter is the number of primitive calls, and the former is the actual number of
-   calls.  Note that when the function does not recurse, these two values are the
-   same, and only the single figure is printed.
+   When there are two numbers in the first column (for example,
+   ``43/3``), then the latter is the number of primitive calls, and
+   the former is the actual number of calls.  Note that when the
+   function does not recurse, these two values are the same, and only
+   the single figure is printed.
 
-   If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno),
-   ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or
-   ``'cumulative'`` (sort by cumulative time).  The default is ``'stdname'``.
+   If *sort* is given, it can be one of values allowed for *key*
+   parameter from :meth:`pstats.Stats.sort_stats`.
 
 
 .. function:: runctx(command, globals, locals, filename=None)
@@ -291,19 +292,22 @@
 
 .. class:: Stats(*filenames, stream=sys.stdout)
 
-   This class constructor creates an instance of a "statistics object" from a
-   *filename* (or set of filenames).  :class:`Stats` objects are manipulated by
-   methods, in order to print useful reports.  You may specify an alternate output
-   stream by giving the keyword argument, ``stream``.
+   This class constructor creates an instance of a "statistics object"
+   from a *filename* (or set of filenames).  :class:`Stats` objects
+   are manipulated by methods, in order to print useful reports.  You
+   may specify an alternate output stream by giving the keyword
+   argument, ``stream``.
 
-   The file selected by the above constructor must have been created by the
-   corresponding version of :mod:`profile` or :mod:`cProfile`.  To be specific,
-   there is *no* file compatibility guaranteed with future versions of this
-   profiler, and there is no compatibility with files produced by other profilers.
-   If several files are provided, all the statistics for identical functions will
-   be coalesced, so that an overall view of several processes can be considered in
-   a single report.  If additional files need to be combined with data in an
-   existing :class:`Stats` object, the :meth:`add` method can be used.
+   The file selected by the above constructor must have been created
+   by the corresponding version of :mod:`profile` or :mod:`cProfile`.
+   To be specific, there is *no* file compatibility guaranteed with
+   future versions of this profiler, and there is no compatibility
+   with files produced by other profilers.  If several files are
+   provided, all the statistics for identical functions will be
+   coalesced, so that an overall view of several processes can be
+   considered in a single report.  If additional files need to be
+   combined with data in an existing :class:`Stats` object, the
+   :meth:`add` method can be used.
 
    .. (such as the old system profiler).
 
@@ -318,15 +322,17 @@
 
 .. method:: Stats.strip_dirs()
 
-   This method for the :class:`Stats` class removes all leading path information
-   from file names.  It is very useful in reducing the size of the printout to fit
-   within (close to) 80 columns.  This method modifies the object, and the stripped
-   information is lost.  After performing a strip operation, the object is
-   considered to have its entries in a "random" order, as it was just after object
-   initialization and loading.  If :meth:`strip_dirs` causes two function names to
-   be indistinguishable (they are on the same line of the same filename, and have
-   the same function name), then the statistics for these two entries are
-   accumulated into a single entry.
+   This method for the :class:`Stats` class removes all leading path
+   information from file names.  It is very useful in reducing the
+   size of the printout to fit within (close to) 80 columns.  This
+   method modifies the object, and the stripped information is lost.
+   After performing a strip operation, the object is considered to
+   have its entries in a "random" order, as it was just after object
+   initialization and loading.  If :meth:`strip_dirs` causes two
+   function names to be indistinguishable (they are on the same line
+   of the same filename, and have the same function name), then the
+   statistics for these two entries are accumulated into a single
+   entry.
 
 
 .. method:: Stats.add(*filenames)
@@ -340,23 +346,25 @@
 
 .. method:: Stats.dump_stats(filename)
 
-   Save the data loaded into the :class:`Stats` object to a file named *filename*.
-   The file is created if it does not exist, and is overwritten if it already
-   exists.  This is equivalent to the method of the same name on the
-   :class:`profile.Profile` and :class:`cProfile.Profile` classes.
+   Save the data loaded into the :class:`Stats` object to a file named
+   *filename*.  The file is created if it does not exist, and is
+   overwritten if it already exists.  This is equivalent to the method
+   of the same name on the :class:`profile.Profile` and
+   :class:`cProfile.Profile` classes.
 
 
 .. method:: Stats.sort_stats(*keys)
 
-   This method modifies the :class:`Stats` object by sorting it according to the
-   supplied criteria.  The argument is typically a string identifying the basis of
-   a sort (example: ``'time'`` or ``'name'``).
+   This method modifies the :class:`Stats` object by sorting it
+   according to the supplied criteria.  The argument is typically a
+   string identifying the basis of a sort (example: ``'time'`` or
+   ``'name'``).
 
-   When more than one key is provided, then additional keys are used as secondary
-   criteria when there is equality in all keys selected before them.  For example,
-   ``sort_stats('name', 'file')`` will sort all the entries according to their
-   function name, and resolve all ties (identical function names) by sorting by
-   file name.
+   When more than one key is provided, then additional keys are used
+   as secondary criteria when there is equality in all keys selected
+   before them.  For example, ``sort_stats('name', 'file')`` will sort
+   all the entries according to their function name, and resolve all
+   ties (identical function names) by sorting by file name.
 
    Abbreviations can be used for any key names, as long as the abbreviation is
    unambiguous.  The following are the keys currently defined:
@@ -368,10 +376,16 @@
    +------------------+----------------------+
    | ``'cumulative'`` | cumulative time      |
    +------------------+----------------------+
+   | ``'cumtime'``    | cumulative time      |
+   +------------------+----------------------+
    | ``'file'``       | file name            |
    +------------------+----------------------+
+   | ``'filename'``   | file name            |
+   +------------------+----------------------+
    | ``'module'``     | file name            |
    +------------------+----------------------+
+   | ``'ncalls'``     | call count           |
+   +------------------+----------------------+
    | ``'pcalls'``     | primitive call count |
    +------------------+----------------------+
    | ``'line'``       | line number          |
@@ -384,51 +398,60 @@
    +------------------+----------------------+
    | ``'time'``       | internal time        |
    +------------------+----------------------+
+   | ``'tottime'``    | internal time        |
+   +------------------+----------------------+
 
-   Note that all sorts on statistics are in descending order (placing most time
-   consuming items first), where as name, file, and line number searches are in
-   ascending order (alphabetical). The subtle distinction between ``'nfl'`` and
-   ``'stdname'`` is that the standard name is a sort of the name as printed, which
-   means that the embedded line numbers get compared in an odd way.  For example,
-   lines 3, 20, and 40 would (if the file names were the same) appear in the string
-   order 20, 3 and 40.  In contrast, ``'nfl'`` does a numeric compare of the line
-   numbers.  In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name',
-   'file', 'line')``.
+   Note that all sorts on statistics are in descending order (placing
+   most time consuming items first), where as name, file, and line
+   number searches are in ascending order (alphabetical). The subtle
+   distinction between ``'nfl'`` and ``'stdname'`` is that the
+   standard name is a sort of the name as printed, which means that
+   the embedded line numbers get compared in an odd way.  For example,
+   lines 3, 20, and 40 would (if the file names were the same) appear
+   in the string order 20, 3 and 40.  In contrast, ``'nfl'`` does a
+   numeric compare of the line numbers.  In fact,
+   ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file',
+   'line')``.
 
-   For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``,
-   and ``2`` are permitted.  They are interpreted as ``'stdname'``, ``'calls'``,
-   ``'time'``, and ``'cumulative'`` respectively.  If this old style format
-   (numeric) is used, only one sort key (the numeric key) will be used, and
-   additional arguments will be silently ignored.
+   For backward-compatibility reasons, the numeric arguments ``-1``,
+   ``0``, ``1``, and ``2`` are permitted.  They are interpreted as
+   ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'``
+   respectively.  If this old style format (numeric) is used, only one
+   sort key (the numeric key) will be used, and additional arguments
+   will be silently ignored.
 
    .. For compatibility with the old profiler,
 
 
 .. method:: Stats.reverse_order()
 
-   This method for the :class:`Stats` class reverses the ordering of the basic list
-   within the object.  Note that by default ascending vs descending order is
-   properly selected based on the sort key of choice.
+   This method for the :class:`Stats` class reverses the ordering of
+   the basic list within the object.  Note that by default ascending
+   vs descending order is properly selected based on the sort key of
+   choice.
 
    .. This method is provided primarily for compatibility with the old profiler.
 
 
 .. method:: Stats.print_stats(*restrictions)
 
-   This method for the :class:`Stats` class prints out a report as described in the
-   :func:`profile.run` definition.
+   This method for the :class:`Stats` class prints out a report as
+   described in the :func:`profile.run` definition.
 
-   The order of the printing is based on the last :meth:`sort_stats` operation done
-   on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`).
+   The order of the printing is based on the last :meth:`sort_stats`
+   operation done on the object (subject to caveats in :meth:`add` and
+   :meth:`strip_dirs`).
 
-   The arguments provided (if any) can be used to limit the list down to the
-   significant entries.  Initially, the list is taken to be the complete set of
-   profiled functions.  Each restriction is either an integer (to select a count of
-   lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a
-   percentage of lines), or a regular expression (to pattern match the standard
-   name that is printed; as of Python 1.5b1, this uses the Perl-style regular
-   expression syntax defined by the :mod:`re` module).  If several restrictions are
-   provided, then they are applied sequentially.  For example::
+   The arguments provided (if any) can be used to limit the list down
+   to the significant entries.  Initially, the list is taken to be the
+   complete set of profiled functions.  Each restriction is either an
+   integer (to select a count of lines), or a decimal fraction between
+   0.0 and 1.0 inclusive (to select a percentage of lines), or a
+   regular expression (to pattern match the standard name that is
+   printed; as of Python 1.5b1, this uses the Perl-style regular
+   expression syntax defined by the :mod:`re` module).  If several
+   restrictions are provided, then they are applied sequentially.  For
+   example::
 
       print_stats(.1, 'foo:')
 
@@ -455,17 +478,19 @@
      non-parenthesized number repeats the cumulative time spent in the function
      at the right.
 
-   * With :mod:`cProfile`, each caller is preceded by three numbers: the number of
-     times this specific call was made, and the total and cumulative times spent in
-     the current function while it was invoked by this specific caller.
+   * With :mod:`cProfile`, each caller is preceded by three numbers:
+     the number of times this specific call was made, and the total
+     and cumulative times spent in the current function while it was
+     invoked by this specific caller.
 
 
 .. method:: Stats.print_callees(*restrictions)
 
-   This method for the :class:`Stats` class prints a list of all function that were
-   called by the indicated function.  Aside from this reversal of direction of
-   calls (re: called vs was called by), the arguments and ordering are identical to
-   the :meth:`print_callers` method.
+   This method for the :class:`Stats` class prints a list of all
+   function that were called by the indicated function.  Aside from
+   this reversal of direction of calls (re: called vs was called by),
+   the arguments and ordering are identical to the
+   :meth:`print_callers` method.
 
 
 .. _profile-limits:
@@ -566,29 +591,33 @@
 The resulting profiler will then call :func:`your_time_func`.
 
 :class:`profile.Profile`
-   :func:`your_time_func` should return a single number, or a list of numbers whose
-   sum is the current time (like what :func:`os.times` returns).  If the function
-   returns a single time number, or the list of returned numbers has length 2, then
-   you will get an especially fast version of the dispatch routine.
+   :func:`your_time_func` should return a single number, or a list of
+   numbers whose sum is the current time (like what :func:`os.times`
+   returns).  If the function returns a single time number, or the
+   list of returned numbers has length 2, then you will get an
+   especially fast version of the dispatch routine.
 
-   Be warned that you should calibrate the profiler class for the timer function
-   that you choose.  For most machines, a timer that returns a lone integer value
-   will provide the best results in terms of low overhead during profiling.
-   (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point
-   values).  If you want to substitute a better timer in the cleanest fashion,
-   derive a class and hardwire a replacement dispatch method that best handles your
-   timer call, along with the appropriate calibration constant.
+   Be warned that you should calibrate the profiler class for the
+   timer function that you choose.  For most machines, a timer that
+   returns a lone integer value will provide the best results in terms
+   of low overhead during profiling.  (:func:`os.times` is *pretty*
+   bad, as it returns a tuple of floating point values).  If you want
+   to substitute a better timer in the cleanest fashion, derive a
+   class and hardwire a replacement dispatch method that best handles
+   your timer call, along with the appropriate calibration constant.
 
 :class:`cProfile.Profile`
-   :func:`your_time_func` should return a single number.  If it returns
-   integers, you can also invoke the class constructor with a second argument
-   specifying the real duration of one unit of time.  For example, if
-   :func:`your_integer_time_func` returns times measured in thousands of seconds,
-   you would construct the :class:`Profile` instance as follows::
+   :func:`your_time_func` should return a single number.  If it
+   returns integers, you can also invoke the class constructor with a
+   second argument specifying the real duration of one unit of time.
+   For example, if :func:`your_integer_time_func` returns times
+   measured in thousands of seconds, you would construct the
+   :class:`Profile` instance as follows::
 
       pr = profile.Profile(your_integer_time_func, 0.001)
 
-   As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer
-   functions should be used with care and should be as fast as possible.  For the
-   best results with a custom timer, it might be necessary to hard-code it in the C
-   source of the internal :mod:`_lsprof` module.
+   As the :mod:`cProfile.Profile` class cannot be calibrated, custom
+   timer functions should be used with care and should be as fast as
+   possible.  For the best results with a custom timer, it might be
+   necessary to hard-code it in the C source of the internal
+   :mod:`_lsprof` module.
diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py
--- a/Lib/test/test_bisect.py
+++ b/Lib/test/test_bisect.py
@@ -239,7 +239,7 @@
                 else:
                     f = self.module.insort_right
                 f(insorted, digit)
-        self.assertEqual(sorted(insorted), insorted)
+            self.assertEqual(sorted(insorted), insorted)
 
     def test_backcompatibility(self):
         self.assertEqual(self.module.insort, self.module.insort_right)

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

From python-checkins at python.org  Thu Nov  1 00:03:38 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 00:03:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XsQ8B0TX3zPhl@mail.python.org>

http://hg.python.org/cpython/rev/e3eb94389e95
changeset:   80144:e3eb94389e95
parent:      80142:9c2df50b4fe0
parent:      80140:b3434c1ae503
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 19:02:24 2012 -0400
summary:
  merge heads

files:
  Doc/library/decimal.rst      |   21 +-
  Doc/library/profile.rst      |  231 ++++++++++++----------
  Lib/test/support.py          |    2 +-
  Lib/test/test_bisect.py      |    2 +-
  Lib/test/test_genericpath.py |   12 +-
  Lib/test/test_os.py          |   83 ++++---
  Modules/posixmodule.c        |   99 ++-------
  7 files changed, 224 insertions(+), 226 deletions(-)


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -750,12 +750,21 @@
 
    .. method:: remainder_near(other[, context])
 
-      Compute the modulo as either a positive or negative value depending on
-      which is closest to zero.  For instance, ``Decimal(10).remainder_near(6)``
-      returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``.
-
-      If both are equally close, the one chosen will have the same sign as
-      *self*.
+      Return the remainder from dividing *self* by *other*.  This differs from
+      ``self % other`` in that the sign of the remainder is chosen so as to
+      minimize its absolute value.  More precisely, the return value is
+      ``self - n * other`` where ``n`` is the integer nearest to the exact
+      value of ``self / other``, and if two integers are equally near then the
+      even one is chosen.
+
+      If the result is zero then its sign will be the sign of *self*.
+
+      >>> Decimal(18).remainder_near(Decimal(10))
+      Decimal('-2')
+      >>> Decimal(25).remainder_near(Decimal(10))
+      Decimal('5')
+      >>> Decimal(35).remainder_near(Decimal(10))
+      Decimal('-5')
 
    .. method:: rotate(other[, context])
 
diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -240,11 +240,12 @@
         43/3    0.533    0.012    0.749    0.250 pobject.py:99(evaluate)
        ...
 
-   The first line indicates that 2706 calls were monitored.  Of those calls, 2004
-   were :dfn:`primitive`.  We define :dfn:`primitive` to mean that the call was not
-   induced via recursion. The next line: ``Ordered by: standard name``, indicates
-   that the text string in the far right column was used to sort the output. The
-   column headings include:
+   The first line indicates that 2706 calls were monitored.  Of those
+   calls, 2004 were :dfn:`primitive`.  We define :dfn:`primitive` to
+   mean that the call was not induced via recursion. The next line:
+   ``Ordered by: standard name``, indicates that the text string in
+   the far right column was used to sort the output. The column
+   headings include:
 
    ncalls
       for the number of calls,
@@ -266,14 +267,14 @@
    filename:lineno(function)
       provides the respective data of each function
 
-   When there are two numbers in the first column (for example, ``43/3``), then the
-   latter is the number of primitive calls, and the former is the actual number of
-   calls.  Note that when the function does not recurse, these two values are the
-   same, and only the single figure is printed.
+   When there are two numbers in the first column (for example,
+   ``43/3``), then the latter is the number of primitive calls, and
+   the former is the actual number of calls.  Note that when the
+   function does not recurse, these two values are the same, and only
+   the single figure is printed.
 
-   If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno),
-   ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or
-   ``'cumulative'`` (sort by cumulative time).  The default is ``'stdname'``.
+   If *sort* is given, it can be one of values allowed for *key*
+   parameter from :meth:`pstats.Stats.sort_stats`.
 
 
 .. function:: runctx(command, globals, locals, filename=None)
@@ -291,19 +292,22 @@
 
 .. class:: Stats(*filenames, stream=sys.stdout)
 
-   This class constructor creates an instance of a "statistics object" from a
-   *filename* (or set of filenames).  :class:`Stats` objects are manipulated by
-   methods, in order to print useful reports.  You may specify an alternate output
-   stream by giving the keyword argument, ``stream``.
+   This class constructor creates an instance of a "statistics object"
+   from a *filename* (or set of filenames).  :class:`Stats` objects
+   are manipulated by methods, in order to print useful reports.  You
+   may specify an alternate output stream by giving the keyword
+   argument, ``stream``.
 
-   The file selected by the above constructor must have been created by the
-   corresponding version of :mod:`profile` or :mod:`cProfile`.  To be specific,
-   there is *no* file compatibility guaranteed with future versions of this
-   profiler, and there is no compatibility with files produced by other profilers.
-   If several files are provided, all the statistics for identical functions will
-   be coalesced, so that an overall view of several processes can be considered in
-   a single report.  If additional files need to be combined with data in an
-   existing :class:`Stats` object, the :meth:`add` method can be used.
+   The file selected by the above constructor must have been created
+   by the corresponding version of :mod:`profile` or :mod:`cProfile`.
+   To be specific, there is *no* file compatibility guaranteed with
+   future versions of this profiler, and there is no compatibility
+   with files produced by other profilers.  If several files are
+   provided, all the statistics for identical functions will be
+   coalesced, so that an overall view of several processes can be
+   considered in a single report.  If additional files need to be
+   combined with data in an existing :class:`Stats` object, the
+   :meth:`add` method can be used.
 
    .. (such as the old system profiler).
 
@@ -318,15 +322,17 @@
 
 .. method:: Stats.strip_dirs()
 
-   This method for the :class:`Stats` class removes all leading path information
-   from file names.  It is very useful in reducing the size of the printout to fit
-   within (close to) 80 columns.  This method modifies the object, and the stripped
-   information is lost.  After performing a strip operation, the object is
-   considered to have its entries in a "random" order, as it was just after object
-   initialization and loading.  If :meth:`strip_dirs` causes two function names to
-   be indistinguishable (they are on the same line of the same filename, and have
-   the same function name), then the statistics for these two entries are
-   accumulated into a single entry.
+   This method for the :class:`Stats` class removes all leading path
+   information from file names.  It is very useful in reducing the
+   size of the printout to fit within (close to) 80 columns.  This
+   method modifies the object, and the stripped information is lost.
+   After performing a strip operation, the object is considered to
+   have its entries in a "random" order, as it was just after object
+   initialization and loading.  If :meth:`strip_dirs` causes two
+   function names to be indistinguishable (they are on the same line
+   of the same filename, and have the same function name), then the
+   statistics for these two entries are accumulated into a single
+   entry.
 
 
 .. method:: Stats.add(*filenames)
@@ -340,23 +346,25 @@
 
 .. method:: Stats.dump_stats(filename)
 
-   Save the data loaded into the :class:`Stats` object to a file named *filename*.
-   The file is created if it does not exist, and is overwritten if it already
-   exists.  This is equivalent to the method of the same name on the
-   :class:`profile.Profile` and :class:`cProfile.Profile` classes.
+   Save the data loaded into the :class:`Stats` object to a file named
+   *filename*.  The file is created if it does not exist, and is
+   overwritten if it already exists.  This is equivalent to the method
+   of the same name on the :class:`profile.Profile` and
+   :class:`cProfile.Profile` classes.
 
 
 .. method:: Stats.sort_stats(*keys)
 
-   This method modifies the :class:`Stats` object by sorting it according to the
-   supplied criteria.  The argument is typically a string identifying the basis of
-   a sort (example: ``'time'`` or ``'name'``).
+   This method modifies the :class:`Stats` object by sorting it
+   according to the supplied criteria.  The argument is typically a
+   string identifying the basis of a sort (example: ``'time'`` or
+   ``'name'``).
 
-   When more than one key is provided, then additional keys are used as secondary
-   criteria when there is equality in all keys selected before them.  For example,
-   ``sort_stats('name', 'file')`` will sort all the entries according to their
-   function name, and resolve all ties (identical function names) by sorting by
-   file name.
+   When more than one key is provided, then additional keys are used
+   as secondary criteria when there is equality in all keys selected
+   before them.  For example, ``sort_stats('name', 'file')`` will sort
+   all the entries according to their function name, and resolve all
+   ties (identical function names) by sorting by file name.
 
    Abbreviations can be used for any key names, as long as the abbreviation is
    unambiguous.  The following are the keys currently defined:
@@ -368,10 +376,16 @@
    +------------------+----------------------+
    | ``'cumulative'`` | cumulative time      |
    +------------------+----------------------+
+   | ``'cumtime'``    | cumulative time      |
+   +------------------+----------------------+
    | ``'file'``       | file name            |
    +------------------+----------------------+
+   | ``'filename'``   | file name            |
+   +------------------+----------------------+
    | ``'module'``     | file name            |
    +------------------+----------------------+
+   | ``'ncalls'``     | call count           |
+   +------------------+----------------------+
    | ``'pcalls'``     | primitive call count |
    +------------------+----------------------+
    | ``'line'``       | line number          |
@@ -384,51 +398,60 @@
    +------------------+----------------------+
    | ``'time'``       | internal time        |
    +------------------+----------------------+
+   | ``'tottime'``    | internal time        |
+   +------------------+----------------------+
 
-   Note that all sorts on statistics are in descending order (placing most time
-   consuming items first), where as name, file, and line number searches are in
-   ascending order (alphabetical). The subtle distinction between ``'nfl'`` and
-   ``'stdname'`` is that the standard name is a sort of the name as printed, which
-   means that the embedded line numbers get compared in an odd way.  For example,
-   lines 3, 20, and 40 would (if the file names were the same) appear in the string
-   order 20, 3 and 40.  In contrast, ``'nfl'`` does a numeric compare of the line
-   numbers.  In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name',
-   'file', 'line')``.
+   Note that all sorts on statistics are in descending order (placing
+   most time consuming items first), where as name, file, and line
+   number searches are in ascending order (alphabetical). The subtle
+   distinction between ``'nfl'`` and ``'stdname'`` is that the
+   standard name is a sort of the name as printed, which means that
+   the embedded line numbers get compared in an odd way.  For example,
+   lines 3, 20, and 40 would (if the file names were the same) appear
+   in the string order 20, 3 and 40.  In contrast, ``'nfl'`` does a
+   numeric compare of the line numbers.  In fact,
+   ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file',
+   'line')``.
 
-   For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``,
-   and ``2`` are permitted.  They are interpreted as ``'stdname'``, ``'calls'``,
-   ``'time'``, and ``'cumulative'`` respectively.  If this old style format
-   (numeric) is used, only one sort key (the numeric key) will be used, and
-   additional arguments will be silently ignored.
+   For backward-compatibility reasons, the numeric arguments ``-1``,
+   ``0``, ``1``, and ``2`` are permitted.  They are interpreted as
+   ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'``
+   respectively.  If this old style format (numeric) is used, only one
+   sort key (the numeric key) will be used, and additional arguments
+   will be silently ignored.
 
    .. For compatibility with the old profiler,
 
 
 .. method:: Stats.reverse_order()
 
-   This method for the :class:`Stats` class reverses the ordering of the basic list
-   within the object.  Note that by default ascending vs descending order is
-   properly selected based on the sort key of choice.
+   This method for the :class:`Stats` class reverses the ordering of
+   the basic list within the object.  Note that by default ascending
+   vs descending order is properly selected based on the sort key of
+   choice.
 
    .. This method is provided primarily for compatibility with the old profiler.
 
 
 .. method:: Stats.print_stats(*restrictions)
 
-   This method for the :class:`Stats` class prints out a report as described in the
-   :func:`profile.run` definition.
+   This method for the :class:`Stats` class prints out a report as
+   described in the :func:`profile.run` definition.
 
-   The order of the printing is based on the last :meth:`sort_stats` operation done
-   on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`).
+   The order of the printing is based on the last :meth:`sort_stats`
+   operation done on the object (subject to caveats in :meth:`add` and
+   :meth:`strip_dirs`).
 
-   The arguments provided (if any) can be used to limit the list down to the
-   significant entries.  Initially, the list is taken to be the complete set of
-   profiled functions.  Each restriction is either an integer (to select a count of
-   lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a
-   percentage of lines), or a regular expression (to pattern match the standard
-   name that is printed; as of Python 1.5b1, this uses the Perl-style regular
-   expression syntax defined by the :mod:`re` module).  If several restrictions are
-   provided, then they are applied sequentially.  For example::
+   The arguments provided (if any) can be used to limit the list down
+   to the significant entries.  Initially, the list is taken to be the
+   complete set of profiled functions.  Each restriction is either an
+   integer (to select a count of lines), or a decimal fraction between
+   0.0 and 1.0 inclusive (to select a percentage of lines), or a
+   regular expression (to pattern match the standard name that is
+   printed; as of Python 1.5b1, this uses the Perl-style regular
+   expression syntax defined by the :mod:`re` module).  If several
+   restrictions are provided, then they are applied sequentially.  For
+   example::
 
       print_stats(.1, 'foo:')
 
@@ -455,17 +478,19 @@
      non-parenthesized number repeats the cumulative time spent in the function
      at the right.
 
-   * With :mod:`cProfile`, each caller is preceded by three numbers: the number of
-     times this specific call was made, and the total and cumulative times spent in
-     the current function while it was invoked by this specific caller.
+   * With :mod:`cProfile`, each caller is preceded by three numbers:
+     the number of times this specific call was made, and the total
+     and cumulative times spent in the current function while it was
+     invoked by this specific caller.
 
 
 .. method:: Stats.print_callees(*restrictions)
 
-   This method for the :class:`Stats` class prints a list of all function that were
-   called by the indicated function.  Aside from this reversal of direction of
-   calls (re: called vs was called by), the arguments and ordering are identical to
-   the :meth:`print_callers` method.
+   This method for the :class:`Stats` class prints a list of all
+   function that were called by the indicated function.  Aside from
+   this reversal of direction of calls (re: called vs was called by),
+   the arguments and ordering are identical to the
+   :meth:`print_callers` method.
 
 
 .. _profile-limits:
@@ -566,29 +591,33 @@
 The resulting profiler will then call :func:`your_time_func`.
 
 :class:`profile.Profile`
-   :func:`your_time_func` should return a single number, or a list of numbers whose
-   sum is the current time (like what :func:`os.times` returns).  If the function
-   returns a single time number, or the list of returned numbers has length 2, then
-   you will get an especially fast version of the dispatch routine.
+   :func:`your_time_func` should return a single number, or a list of
+   numbers whose sum is the current time (like what :func:`os.times`
+   returns).  If the function returns a single time number, or the
+   list of returned numbers has length 2, then you will get an
+   especially fast version of the dispatch routine.
 
-   Be warned that you should calibrate the profiler class for the timer function
-   that you choose.  For most machines, a timer that returns a lone integer value
-   will provide the best results in terms of low overhead during profiling.
-   (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point
-   values).  If you want to substitute a better timer in the cleanest fashion,
-   derive a class and hardwire a replacement dispatch method that best handles your
-   timer call, along with the appropriate calibration constant.
+   Be warned that you should calibrate the profiler class for the
+   timer function that you choose.  For most machines, a timer that
+   returns a lone integer value will provide the best results in terms
+   of low overhead during profiling.  (:func:`os.times` is *pretty*
+   bad, as it returns a tuple of floating point values).  If you want
+   to substitute a better timer in the cleanest fashion, derive a
+   class and hardwire a replacement dispatch method that best handles
+   your timer call, along with the appropriate calibration constant.
 
 :class:`cProfile.Profile`
-   :func:`your_time_func` should return a single number.  If it returns
-   integers, you can also invoke the class constructor with a second argument
-   specifying the real duration of one unit of time.  For example, if
-   :func:`your_integer_time_func` returns times measured in thousands of seconds,
-   you would construct the :class:`Profile` instance as follows::
+   :func:`your_time_func` should return a single number.  If it
+   returns integers, you can also invoke the class constructor with a
+   second argument specifying the real duration of one unit of time.
+   For example, if :func:`your_integer_time_func` returns times
+   measured in thousands of seconds, you would construct the
+   :class:`Profile` instance as follows::
 
       pr = profile.Profile(your_integer_time_func, 0.001)
 
-   As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer
-   functions should be used with care and should be as fast as possible.  For the
-   best results with a custom timer, it might be necessary to hard-code it in the C
-   source of the internal :mod:`_lsprof` module.
+   As the :mod:`cProfile.Profile` class cannot be calibrated, custom
+   timer functions should be used with care and should be as fast as
+   possible.  For the best results with a custom timer, it might be
+   necessary to hard-code it in the C source of the internal
+   :mod:`_lsprof` module.
diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -654,7 +654,7 @@
 for name in (b'abc\xff', b'\xe7w\xf0'):
     try:
         os.fsdecode(name)
-    except UnicodeDecodeErorr:
+    except UnicodeDecodeError:
         TESTFN_UNDECODABLE = name
         break
 
diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py
--- a/Lib/test/test_bisect.py
+++ b/Lib/test/test_bisect.py
@@ -239,7 +239,7 @@
                 else:
                     f = self.module.insort_right
                 f(insorted, digit)
-        self.assertEqual(sorted(insorted), insorted)
+            self.assertEqual(sorted(insorted), insorted)
 
     def test_backcompatibility(self):
         self.assertEqual(self.module.insort, self.module.insort_right)
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -311,14 +311,10 @@
     @unittest.skipIf(sys.platform == 'darwin',
         "Mac OS X denies the creation of a directory with an invalid utf8 name")
     def test_nonascii_abspath(self):
-        name = b'\xe7w\xf0'
-        if sys.platform == 'win32':
-            try:
-                os.fsdecode(name)
-            except UnicodeDecodeError:
-                self.skipTest("the filename %a is not decodable "
-                              "from the ANSI code page %s"
-                              % (name, sys.getfilesystemencoding()))
+        if support.TESTFN_UNDECODABLE:
+            name = support.TESTFN_UNDECODABLE
+        else:
+            name = b'a\xffb\xe7w\xf0'
 
         # Test non-ASCII, non-UTF8 bytes in the path.
         with warnings.catch_warnings():
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
@@ -2051,65 +2051,82 @@
         class Str(str):
             pass
 
-        self.filenames = []
+        self.bytes_filenames = []
+        self.unicode_filenames = []
         if support.TESTFN_UNENCODABLE is not None:
             decoded = support.TESTFN_UNENCODABLE
         else:
             decoded = support.TESTFN
-        self.filenames.append(decoded)
-        self.filenames.append(Str(decoded))
+        self.unicode_filenames.append(decoded)
+        self.unicode_filenames.append(Str(decoded))
         if support.TESTFN_UNDECODABLE is not None:
             encoded = support.TESTFN_UNDECODABLE
         else:
             encoded = os.fsencode(support.TESTFN)
-        self.filenames.append(encoded)
-        self.filenames.append(memoryview(encoded))
+        self.bytes_filenames.append(encoded)
+        self.bytes_filenames.append(memoryview(encoded))
+
+        self.filenames = self.bytes_filenames + self.unicode_filenames
 
     def test_oserror_filename(self):
         funcs = [
-            (os.chdir,),
-            (os.chmod, 0o777),
-            (os.lchown, 0, 0),
-            (os.listdir,),
-            (os.lstat,),
-            (os.open, os.O_RDONLY),
-            (os.rename, "dst"),
-            (os.replace, "dst"),
-            (os.rmdir,),
-            (os.stat,),
-            (os.truncate, 0),
-            (os.unlink,),
+            (self.filenames, os.chdir,),
+            (self.filenames, os.chmod, 0o777),
+            (self.filenames, os.listdir,),
+            (self.filenames, os.lstat,),
+            (self.filenames, os.open, os.O_RDONLY),
+            (self.filenames, os.rmdir,),
+            (self.filenames, os.stat,),
+            (self.filenames, os.unlink,),
         ]
-        if hasattr(os, "chown"):
-            funcs.append((os.chown, 0, 0))
         if sys.platform == "win32":
             funcs.extend((
-                (os._getfullpathname,),
-                (os._isdir,),
+                (self.bytes_filenames, os.rename, b"dst"),
+                (self.bytes_filenames, os.replace, b"dst"),
+                (self.unicode_filenames, os.rename, "dst"),
+                (self.unicode_filenames, os.replace, "dst"),
             ))
+        else:
+            funcs.extend((
+                (self.filenames, os.rename, "dst"),
+                (self.filenames, os.replace, "dst"),
+            ))
+        if hasattr(os, "chown"):
+            funcs.append((self.filenames, os.chown, 0, 0))
+        if hasattr(os, "lchown"):
+            funcs.append((self.filenames, os.lchown, 0, 0))
+        if hasattr(os, "truncate"):
+            funcs.append((self.filenames, os.truncate, 0))
         if hasattr(os, "chflags"):
             funcs.extend((
-                (os.chflags, 0),
-                (os.lchflags, 0),
+                (self.filenames, os.chflags, 0),
+                (self.filenames, os.lchflags, 0),
             ))
         if hasattr(os, "chroot"):
-            funcs.append((os.chroot,))
+            funcs.append((self.filenames, os.chroot,))
         if hasattr(os, "link"):
-            funcs.append((os.link, "dst"))
+            if sys.platform == "win32":
+                funcs.append((self.bytes_filenames, os.link, b"dst"))
+                funcs.append((self.unicode_filenames, os.link, "dst"))
+            else:
+                funcs.append((self.filenames, os.link, "dst"))
         if hasattr(os, "listxattr"):
             funcs.extend((
-                (os.listxattr,),
-                (os.getxattr, "user.test"),
-                (os.setxattr, "user.test", b'user'),
-                (os.removexattr, "user.test"),
+                (self.filenames, os.listxattr,),
+                (self.filenames, os.getxattr, "user.test"),
+                (self.filenames, os.setxattr, "user.test", b'user'),
+                (self.filenames, os.removexattr, "user.test"),
             ))
         if hasattr(os, "lchmod"):
-            funcs.append((os.lchmod, 0o777))
+            funcs.append((self.filenames, os.lchmod, 0o777))
         if hasattr(os, "readlink"):
-            funcs.append((os.readlink,))
+            if sys.platform == "win32":
+                funcs.append((self.unicode_filenames, os.readlink,))
+            else:
+                funcs.append((self.filenames, os.readlink,))
 
-        for func, *func_args in funcs:
-            for name in self.filenames:
+        for filenames, func, *func_args in funcs:
+            for name in filenames:
                 try:
                     func(name, *func_args)
                 except OSError as err:
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1035,17 +1035,6 @@
 }
 
 static PyObject *
-win32_error_unicode(char* function, wchar_t* filename)
-{
-    /* XXX - see win32_error for comments on 'function' */
-    errno = GetLastError();
-    if (filename)
-        return PyErr_SetFromWindowsErrWithUnicodeFilename(errno, filename);
-    else
-        return PyErr_SetFromWindowsErr(errno);
-}
-
-static PyObject *
 win32_error_object(char* function, PyObject* filename)
 {
     /* XXX - see win32_error for comments on 'function' */
@@ -1119,44 +1108,6 @@
 
 
 #ifdef MS_WINDOWS
-static PyObject*
-win32_1str(PyObject* args, char* func,
-           char* format, BOOL (__stdcall *funcA)(LPCSTR),
-           char* wformat, BOOL (__stdcall *funcW)(LPWSTR))
-{
-    PyObject *uni;
-    const char *ansi;
-    BOOL result;
-
-    if (PyArg_ParseTuple(args, wformat, &uni))
-    {
-        wchar_t *wstr = PyUnicode_AsUnicode(uni);
-        if (wstr == NULL)
-            return NULL;
-        Py_BEGIN_ALLOW_THREADS
-        result = funcW(wstr);
-        Py_END_ALLOW_THREADS
-        if (!result)
-            return win32_error_object(func, uni);
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-    PyErr_Clear();
-
-    if (!PyArg_ParseTuple(args, format, &ansi))
-        return NULL;
-    if (win32_warn_bytes_api())
-        return NULL;
-    Py_BEGIN_ALLOW_THREADS
-    result = funcA(ansi);
-    Py_END_ALLOW_THREADS
-    if (!result)
-        return win32_error(func, ansi);
-    Py_INCREF(Py_None);
-    return Py_None;
-
-}
-
 /* This is a reimplementation of the C library's chdir function,
    but one that produces Win32 errors instead of DOS error codes.
    chdir is essentially a wrapper around SetCurrentDirectory; however,
@@ -2533,7 +2484,7 @@
     Py_END_ALLOW_THREADS
 
     if (!result) {
-        return_value = win32_error_object("chmod", path.object);
+        return_value = path_error(&path);
         goto exit;
     }
 #else /* MS_WINDOWS */
@@ -2989,11 +2940,13 @@
             return NULL;
         }
         if (!len) {
-            if (wbuf2 != wbuf) free(wbuf2);
-            return win32_error("getcwdu", NULL);
+            if (wbuf2 != wbuf)
+                free(wbuf2);
+            return PyErr_SetFromWindowsErr(0);
         }
         resobj = PyUnicode_FromWideChar(wbuf2, len);
-        if (wbuf2 != wbuf) free(wbuf2);
+        if (wbuf2 != wbuf)
+            free(wbuf2);
         return resobj;
     }
 
@@ -3101,7 +3054,7 @@
     Py_END_ALLOW_THREADS
 
     if (!result) {
-        return_value = win32_error_object("link", dst.object);
+        return_value = path_error(&src);
         goto exit;
     }
 #else
@@ -3225,8 +3178,7 @@
             if (error == ERROR_FILE_NOT_FOUND)
                 goto exit;
             Py_DECREF(list);
-            list = NULL;
-            win32_error_unicode("FindFirstFileW", wnamebuf);
+            list = path_error(&path);
             goto exit;
         }
         do {
@@ -3255,7 +3207,7 @@
                it got to the end of the directory. */
             if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
                 Py_DECREF(list);
-                list = win32_error_unicode("FindNextFileW", wnamebuf);
+                list = path_error(&path);
                 goto exit;
             }
         } while (result == TRUE);
@@ -3282,7 +3234,7 @@
         if (error == ERROR_FILE_NOT_FOUND)
             goto exit;
         Py_DECREF(list);
-        list = win32_error("FindFirstFile", namebuf);
+        list = path_error(&path);
         goto exit;
     }
     do {
@@ -3310,7 +3262,7 @@
            it got to the end of the directory. */
         if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
             Py_DECREF(list);
-            list = win32_error("FindNextFile", namebuf);
+            list = path_error(&path);
             goto exit;
         }
     } while (result == TRUE);
@@ -3320,7 +3272,7 @@
         if (FindClose(hFindFile) == FALSE) {
             if (list != NULL) {
                 Py_DECREF(list);
-                list = win32_error_object("FindClose", path.object);
+                list = path_error(&path);
             }
         }
     }
@@ -3569,7 +3521,7 @@
         return posix_error();
 
     if (!GetFileInformationByHandle(hFile, &info))
-        return win32_error("_getfileinformation", NULL);
+        return PyErr_SetFromWindowsErr(0);
 
     return Py_BuildValue("iii", info.dwVolumeSerialNumber,
                                 info.nFileIndexHigh,
@@ -3658,7 +3610,7 @@
     Py_END_ALLOW_THREADS
 
     if (!result) {
-        return_value = win32_error_object("mkdir", path.object);
+        return_value = path_error(&path);
         goto exit;
     }
 #else
@@ -3828,7 +3780,7 @@
     Py_END_ALLOW_THREADS
 
     if (!result) {
-        return_value = win32_error_object(function_name, dst.object);
+        return_value = path_error(&src);
         goto exit;
     }
 
@@ -4396,6 +4348,7 @@
     PyObject *return_value = NULL;
 
     memset(&path, 0, sizeof(path));
+    path.function_name = "utime";
 #if UTIME_HAVE_FD
     path.allow_fd = 1;
 #endif
@@ -4484,7 +4437,7 @@
                             FILE_FLAG_BACKUP_SEMANTICS, NULL);
     Py_END_ALLOW_THREADS
     if (hFile == INVALID_HANDLE_VALUE) {
-        win32_error_object("utime", path.object);
+        path_error(&path);
         goto exit;
     }
 
@@ -4493,7 +4446,7 @@
         GetSystemTime(&now);
         if (!SystemTimeToFileTime(&now, &mtime) ||
             !SystemTimeToFileTime(&now, &atime)) {
-            win32_error("utime", NULL);
+            PyErr_SetFromWindowsErr(0);
             goto exit;
         }
     }
@@ -4506,7 +4459,7 @@
            as that may confuse the user into believing that
            something is wrong with the file, when it also
            could be the time stamp that gives a problem. */
-        win32_error("utime", NULL);
+        PyErr_SetFromWindowsErr(0);
         goto exit;
     }
 #else /* MS_WINDOWS */
@@ -6736,7 +6689,7 @@
     Py_END_ALLOW_THREADS
 
     if (!result) {
-        return_value = win32_error_object("symlink", src.object);
+        return_value = path_error(&src);
         goto exit;
     }
 
@@ -6752,7 +6705,7 @@
     Py_END_ALLOW_THREADS
 
     if (result) {
-        return_value = path_error(&dst);
+        return_value = path_error(&src);
         goto exit;
     }
 #endif
@@ -7104,12 +7057,6 @@
     Py_END_ALLOW_THREADS
 
     if (fd == -1) {
-#ifdef MS_WINDOWS
-        /* force use of posix_error here for exact backwards compatibility */
-        if (path.wide)
-            return_value = posix_error();
-        else
-#endif
         return_value = path_error(&path);
         goto exit;
     }
@@ -7648,7 +7595,7 @@
     Py_END_ALLOW_THREADS
     if (res != 0) {
 #ifdef MS_WINDOWS
-        return win32_error("fstat", NULL);
+        return PyErr_SetFromWindowsErr(0);
 #else
         return posix_error();
 #endif
@@ -7694,7 +7641,7 @@
     BOOL ok;
     ok = CreatePipe(&read, &write, NULL, 0);
     if (!ok)
-        return win32_error("CreatePipe", NULL);
+        return PyErr_SetFromWindowsErr(0);
     read_fd = _open_osfhandle((Py_intptr_t)read, 0);
     write_fd = _open_osfhandle((Py_intptr_t)write, 1);
     return Py_BuildValue("(ii)", read_fd, write_fd);

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

From python-checkins at python.org  Thu Nov  1 00:03:39 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 00:03:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4z?=
Message-ID: <3XsQ8C2vS9zPj3@mail.python.org>

http://hg.python.org/cpython/rev/4ca6f43b12ef
changeset:   80145:4ca6f43b12ef
parent:      80144:e3eb94389e95
parent:      80143:3c249adc78aa
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 19:02:30 2012 -0400
summary:
  merge 3.3

files:



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

From python-checkins at python.org  Thu Nov  1 00:49:47 2012
From: python-checkins at python.org (vinay.sajip)
Date: Thu,  1 Nov 2012 00:49:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316366=3A_Improve?=
 =?utf-8?q?_diagnostics_from_handleError=28=29=2E_Thanks_to_Antoine_Pitrou?=
Message-ID: <3XsR9R01g7zPNp@mail.python.org>

http://hg.python.org/cpython/rev/d7b868cdd9bb
changeset:   80146:d7b868cdd9bb
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Wed Oct 31 23:49:19 2012 +0000
summary:
  Closes #16366: Improve diagnostics from handleError(). Thanks to Antoine Pitrou for the suggestion.

files:
  Lib/logging/__init__.py |  23 +++++++++++++++++------
  1 files changed, 17 insertions(+), 6 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -879,16 +879,27 @@
         The record which was being processed is passed in to this method.
         """
         if raiseExceptions and sys.stderr:  # see issue 13807
-            ei = sys.exc_info()
+            t, v, tb = sys.exc_info()
             try:
-                traceback.print_exception(ei[0], ei[1], ei[2],
-                                          None, sys.stderr)
-                sys.stderr.write('Logged from file %s, line %s\n' % (
-                                 record.filename, record.lineno))
+                sys.stderr.write('--- Logging error ---\n')
+                traceback.print_exception(t, v, tb, None, sys.stderr)
+                sys.stderr.write('Call stack:\n')
+                # Walk the stack frame up until we're out of logging,
+                # so as to print the calling context.
+                frame = tb.tb_frame
+                while (frame and os.path.dirname(frame.f_code.co_filename) ==
+                       __path__[0]):
+                    frame = frame.f_back
+                if frame:
+                    traceback.print_stack(frame, file=sys.stderr)
+                else:
+                    # couldn't find the right stack frame, for some reason
+                    sys.stderr.write('Logged from file %s, line %s\n' % (
+                                     record.filename, record.lineno))
             except IOError: #pragma: no cover
                 pass    # see issue 5971
             finally:
-                del ei
+                del t, v, tb
 
 class StreamHandler(Handler):
     """

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

From python-checkins at python.org  Thu Nov  1 01:26:50 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 01:26:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_point_errors_related_to_no?=
 =?utf-8?q?nlocals_and_globals_to_the_statement_declaring_them?=
Message-ID: <3XsS0B1j7RzPhQ@mail.python.org>

http://hg.python.org/cpython/rev/fbfaef0a9c00
changeset:   80147:fbfaef0a9c00
parent:      80145:4ca6f43b12ef
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 20:26:20 2012 -0400
summary:
  point errors related to nonlocals and globals to the statement declaring them (closes #10189)

files:
  Include/symtable.h |   1 +
  Misc/NEWS          |   3 +
  Python/symtable.c  |  57 +++++++++++++++++++++++++++++----
  3 files changed, 53 insertions(+), 8 deletions(-)


diff --git a/Include/symtable.h b/Include/symtable.h
--- a/Include/symtable.h
+++ b/Include/symtable.h
@@ -39,6 +39,7 @@
     PyObject *ste_name;      /* string: name of current block */
     PyObject *ste_varnames;  /* list of function parameters */
     PyObject *ste_children;  /* list of child blocks */
+    PyObject *ste_directives;/* locations of global and nonlocal statements */
     _Py_block_ty ste_type;   /* module, class, or function */
     int ste_unoptimized;     /* false if namespace is optimized */
     int ste_nested;      /* true if block is nested */
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #10189: Improve the error reporting of SyntaxErrors related to global
+  and nonlocal statements.
+
 - Issue #16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned
   (unsigned long and unsigned int) to avoid an undefined behaviour with
   Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -56,6 +56,8 @@
     if (ste->ste_children == NULL)
         goto fail;
 
+    ste->ste_directives = NULL;
+
     ste->ste_type = block;
     ste->ste_unoptimized = 0;
     ste->ste_nested = 0;
@@ -102,6 +104,7 @@
     Py_XDECREF(ste->ste_symbols);
     Py_XDECREF(ste->ste_varnames);
     Py_XDECREF(ste->ste_children);
+    Py_XDECREF(ste->ste_directives);
     PyObject_Del(ste);
 }
 
@@ -319,6 +322,24 @@
     return (PyLong_AS_LONG(v) >> SCOPE_OFFSET) & SCOPE_MASK;
 }
 
+static int
+error_at_directive(PySTEntryObject *ste, PyObject *name)
+{
+    Py_ssize_t i;
+    PyObject *data;
+    assert(ste->ste_directives);
+    for (i = 0; ; i++) {
+        data = PyList_GET_ITEM(ste->ste_directives, i);
+        assert(PyTuple_CheckExact(data));
+        if (PyTuple_GET_ITEM(data, 0) == name)
+            break;
+    }
+    PyErr_SyntaxLocationEx(ste->ste_table->st_filename,
+                           PyLong_AsLong(PyTuple_GET_ITEM(data, 1)),
+                           PyLong_AsLong(PyTuple_GET_ITEM(data, 2)));
+    return 0;
+}
+
 
 /* Analyze raw symbol information to determine scope of each name.
 
@@ -393,16 +414,13 @@
             PyErr_Format(PyExc_SyntaxError,
                         "name '%U' is parameter and global",
                         name);
-            PyErr_SyntaxLocationEx(ste->ste_table->st_filename,
-                                   ste->ste_lineno, ste->ste_col_offset);
-
-            return 0;
+            return error_at_directive(ste, name);
         }
         if (flags & DEF_NONLOCAL) {
             PyErr_Format(PyExc_SyntaxError,
                          "name '%U' is nonlocal and global",
                          name);
-            return 0;
+            return error_at_directive(ste, name);
         }
         SET_SCOPE(scopes, name, GLOBAL_EXPLICIT);
         if (PySet_Add(global, name) < 0)
@@ -416,19 +434,19 @@
             PyErr_Format(PyExc_SyntaxError,
                          "name '%U' is parameter and nonlocal",
                          name);
-            return 0;
+            return error_at_directive(ste, name);
         }
         if (!bound) {
             PyErr_Format(PyExc_SyntaxError,
                          "nonlocal declaration not allowed at module level");
-            return 0;
+            return error_at_directive(ste, name);
         }
         if (!PySet_Contains(bound, name)) {
             PyErr_Format(PyExc_SyntaxError,
                          "no binding for nonlocal '%U' found",
                          name);
 
-            return 0;
+            return error_at_directive(ste, name);
         }
         SET_SCOPE(scopes, name, FREE);
         ste->ste_free = 1;
@@ -1069,6 +1087,25 @@
 
 
 static int
+symtable_record_directive(struct symtable *st, identifier name, stmt_ty s)
+{
+    PyObject *data;
+    int res;
+    if (!st->st_cur->ste_directives) {
+        st->st_cur->ste_directives = PyList_New(0);
+        if (!st->st_cur->ste_directives)
+            return 0;
+    }
+    data = Py_BuildValue("(Oii)", name, s->lineno, s->col_offset);
+    if (!data)
+        return 0;
+    res = PyList_Append(st->st_cur->ste_directives, data);
+    Py_DECREF(data);
+    return res == 0;
+}
+
+
+static int
 symtable_visit_stmt(struct symtable *st, stmt_ty s)
 {
     switch (s->kind) {
@@ -1223,6 +1260,8 @@
             }
             if (!symtable_add_def(st, name, DEF_GLOBAL))
                 return 0;
+            if (!symtable_record_directive(st, name, s))
+                return 0;
         }
         break;
     }
@@ -1252,6 +1291,8 @@
             }
             if (!symtable_add_def(st, name, DEF_NONLOCAL))
                 return 0;
+            if (!symtable_record_directive(st, name, s))
+                return 0;
         }
         break;
     }

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

From python-checkins at python.org  Thu Nov  1 01:26:51 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu,  1 Nov 2012 01:26:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XsS0C49dBzPb4@mail.python.org>

http://hg.python.org/cpython/rev/2d6eec5d01f7
changeset:   80148:2d6eec5d01f7
parent:      80147:fbfaef0a9c00
parent:      80146:d7b868cdd9bb
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 31 20:26:43 2012 -0400
summary:
  merge heads

files:
  Lib/logging/__init__.py |  23 +++++++++++++++++------
  1 files changed, 17 insertions(+), 6 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -879,16 +879,27 @@
         The record which was being processed is passed in to this method.
         """
         if raiseExceptions and sys.stderr:  # see issue 13807
-            ei = sys.exc_info()
+            t, v, tb = sys.exc_info()
             try:
-                traceback.print_exception(ei[0], ei[1], ei[2],
-                                          None, sys.stderr)
-                sys.stderr.write('Logged from file %s, line %s\n' % (
-                                 record.filename, record.lineno))
+                sys.stderr.write('--- Logging error ---\n')
+                traceback.print_exception(t, v, tb, None, sys.stderr)
+                sys.stderr.write('Call stack:\n')
+                # Walk the stack frame up until we're out of logging,
+                # so as to print the calling context.
+                frame = tb.tb_frame
+                while (frame and os.path.dirname(frame.f_code.co_filename) ==
+                       __path__[0]):
+                    frame = frame.f_back
+                if frame:
+                    traceback.print_stack(frame, file=sys.stderr)
+                else:
+                    # couldn't find the right stack frame, for some reason
+                    sys.stderr.write('Logged from file %s, line %s\n' % (
+                                     record.filename, record.lineno))
             except IOError: #pragma: no cover
                 pass    # see issue 5971
             finally:
-                del ei
+                del t, v, tb
 
 class StreamHandler(Handler):
     """

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

From solipsis at pitrou.net  Thu Nov  1 05:56:03 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 01 Nov 2012 05:56:03 +0100
Subject: [Python-checkins] Daily reference leaks (2d6eec5d01f7): sum=2
Message-ID: <E1TTmp1-0006mX-PK@ap.vmr.nerim.net>

results for 2d6eec5d01f7 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/reflog9aV4Nv', '-x']

From python-checkins at python.org  Thu Nov  1 12:31:59 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 12:31:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2Mzcz?=
 =?utf-8?q?=3A_Prevent_infinite_recursion_for_ABC_Set_class_operations=2E?=
Message-ID: <3Xsklg0WXwzPw2@mail.python.org>

http://hg.python.org/cpython/rev/8e95a078d490
changeset:   80149:8e95a078d490
branch:      3.2
parent:      80133:838e2b19489e
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 13:28:54 2012 +0200
summary:
  Issue #16373: Prevent infinite recursion for ABC Set class operations.

files:
  Lib/_abcoll.py               |   4 +-
  Lib/test/test_collections.py |  33 ++++++++++++++++++++++++
  2 files changed, 35 insertions(+), 2 deletions(-)


diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
--- a/Lib/_abcoll.py
+++ b/Lib/_abcoll.py
@@ -184,12 +184,12 @@
     def __gt__(self, other):
         if not isinstance(other, Set):
             return NotImplemented
-        return other < self
+        return other.__lt__(self)
 
     def __ge__(self, other):
         if not isinstance(other, Set):
             return NotImplemented
-        return other <= self
+        return other.__le__(self)
 
     def __eq__(self, other):
         if not isinstance(other, Set):
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -651,6 +651,39 @@
         s |= s
         self.assertEqual(s, full)
 
+    def test_issue16373(self):
+        # Recursion error comparing comparable and noncomparable
+        # Set instances
+        class MyComparableSet(Set):
+            def __contains__(self, x):
+                return False
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                return iter([])
+        class MyNonComparableSet(Set):
+            def __contains__(self, x):
+                return False
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                return iter([])
+            def __le__(self, x):
+                return NotImplemented
+            def __lt__(self, x):
+                return NotImplemented
+
+        cs = MyComparableSet()
+        ncs = MyNonComparableSet()
+        with self.assertRaises(TypeError):
+            ncs < cs
+        with self.assertRaises(TypeError):
+            ncs <= cs
+        with self.assertRaises(TypeError):
+            cs > ncs
+        with self.assertRaises(TypeError):
+            cs >= ncs
+
     def test_Mapping(self):
         for sample in [dict]:
             self.assertIsInstance(sample(), Mapping)

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

From python-checkins at python.org  Thu Nov  1 12:32:00 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 12:32:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=2316373=3A_Prevent_infinite_recursion_for_ABC_Set?=
 =?utf-8?q?_class_operations=2E?=
Message-ID: <3Xsklh38fMzR6Z@mail.python.org>

http://hg.python.org/cpython/rev/11a9297733b8
changeset:   80150:11a9297733b8
branch:      3.3
parent:      80143:3c249adc78aa
parent:      80149:8e95a078d490
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 13:31:12 2012 +0200
summary:
  Merge issue #16373: Prevent infinite recursion for ABC Set class operations.

Patch by Serhiy Storchaka.

files:
  Lib/collections/abc.py       |   4 +-
  Lib/test/test_collections.py |  33 ++++++++++++++++++++++++
  2 files changed, 35 insertions(+), 2 deletions(-)


diff --git a/Lib/collections/abc.py b/Lib/collections/abc.py
--- a/Lib/collections/abc.py
+++ b/Lib/collections/abc.py
@@ -200,12 +200,12 @@
     def __gt__(self, other):
         if not isinstance(other, Set):
             return NotImplemented
-        return other < self
+        return other.__lt__(self)
 
     def __ge__(self, other):
         if not isinstance(other, Set):
             return NotImplemented
-        return other <= self
+        return other.__le__(self)
 
     def __eq__(self, other):
         if not isinstance(other, Set):
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -663,6 +663,39 @@
         s |= s
         self.assertEqual(s, full)
 
+    def test_issue16373(self):
+        # Recursion error comparing comparable and noncomparable
+        # Set instances
+        class MyComparableSet(Set):
+            def __contains__(self, x):
+                return False
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                return iter([])
+        class MyNonComparableSet(Set):
+            def __contains__(self, x):
+                return False
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                return iter([])
+            def __le__(self, x):
+                return NotImplemented
+            def __lt__(self, x):
+                return NotImplemented
+
+        cs = MyComparableSet()
+        ncs = MyNonComparableSet()
+        with self.assertRaises(TypeError):
+            ncs < cs
+        with self.assertRaises(TypeError):
+            ncs <= cs
+        with self.assertRaises(TypeError):
+            cs > ncs
+        with self.assertRaises(TypeError):
+            cs >= ncs
+
     def test_Mapping(self):
         for sample in [dict]:
             self.assertIsInstance(sample(), Mapping)

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

From python-checkins at python.org  Thu Nov  1 12:32:01 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 12:32:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316373=3A_Prevent_infinite_recursion_for_A?=
 =?utf-8?q?BC_Set_class_operations=2E?=
Message-ID: <3Xsklj5Hk3zR9p@mail.python.org>

http://hg.python.org/cpython/rev/e67c8803cd82
changeset:   80151:e67c8803cd82
parent:      80148:2d6eec5d01f7
parent:      80150:11a9297733b8
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 13:31:31 2012 +0200
summary:
  Merge issue #16373: Prevent infinite recursion for ABC Set class operations.

Patch by Serhiy Storchaka.

files:
  Lib/collections/abc.py       |   4 +-
  Lib/test/test_collections.py |  33 ++++++++++++++++++++++++
  2 files changed, 35 insertions(+), 2 deletions(-)


diff --git a/Lib/collections/abc.py b/Lib/collections/abc.py
--- a/Lib/collections/abc.py
+++ b/Lib/collections/abc.py
@@ -200,12 +200,12 @@
     def __gt__(self, other):
         if not isinstance(other, Set):
             return NotImplemented
-        return other < self
+        return other.__lt__(self)
 
     def __ge__(self, other):
         if not isinstance(other, Set):
             return NotImplemented
-        return other <= self
+        return other.__le__(self)
 
     def __eq__(self, other):
         if not isinstance(other, Set):
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -663,6 +663,39 @@
         s |= s
         self.assertEqual(s, full)
 
+    def test_issue16373(self):
+        # Recursion error comparing comparable and noncomparable
+        # Set instances
+        class MyComparableSet(Set):
+            def __contains__(self, x):
+                return False
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                return iter([])
+        class MyNonComparableSet(Set):
+            def __contains__(self, x):
+                return False
+            def __len__(self):
+                return 0
+            def __iter__(self):
+                return iter([])
+            def __le__(self, x):
+                return NotImplemented
+            def __lt__(self, x):
+                return NotImplemented
+
+        cs = MyComparableSet()
+        ncs = MyNonComparableSet()
+        with self.assertRaises(TypeError):
+            ncs < cs
+        with self.assertRaises(TypeError):
+            ncs <= cs
+        with self.assertRaises(TypeError):
+            cs > ncs
+        with self.assertRaises(TypeError):
+            cs >= ncs
+
     def test_Mapping(self):
         for sample in [dict]:
             self.assertIsInstance(sample(), Mapping)

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

From python-checkins at python.org  Thu Nov  1 12:43:53 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 12:43:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Change_docstri?=
 =?utf-8?q?ng_for_xdrlib=2EError_to_use_new_style_exceptions=2E?=
Message-ID: <3Xsl1P5GfDzM5p@mail.python.org>

http://hg.python.org/cpython/rev/e95e647040de
changeset:   80152:e95e647040de
branch:      3.2
parent:      80149:8e95a078d490
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 13:43:06 2012 +0200
summary:
  Change docstring for xdrlib.Error to use new style exceptions.

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


diff --git a/Lib/xdrlib.py b/Lib/xdrlib.py
--- a/Lib/xdrlib.py
+++ b/Lib/xdrlib.py
@@ -13,7 +13,7 @@
 class Error(Exception):
     """Exception class for this module. Use:
 
-    except xdrlib.Error, var:
+    except xdrlib.Error as var:
         # var has the Error instance for the exception
 
     Public ivars:

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

From python-checkins at python.org  Thu Nov  1 12:43:55 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 12:43:55 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge=3A_change_docstring_for_xdrlib=2EError_to_use_new_style_?=
 =?utf-8?q?exceptions=2E?=
Message-ID: <3Xsl1R0GwgzM5p@mail.python.org>

http://hg.python.org/cpython/rev/23ebe277e982
changeset:   80153:23ebe277e982
branch:      3.3
parent:      80150:11a9297733b8
parent:      80152:e95e647040de
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 13:43:31 2012 +0200
summary:
  Merge: change docstring for xdrlib.Error to use new style exceptions.

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


diff --git a/Lib/xdrlib.py b/Lib/xdrlib.py
--- a/Lib/xdrlib.py
+++ b/Lib/xdrlib.py
@@ -13,7 +13,7 @@
 class Error(Exception):
     """Exception class for this module. Use:
 
-    except xdrlib.Error, var:
+    except xdrlib.Error as var:
         # var has the Error instance for the exception
 
     Public ivars:

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

From python-checkins at python.org  Thu Nov  1 12:43:56 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 12:43:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_change_docstring_for_xdrlib=2EError_to_use_new_?=
 =?utf-8?q?style_exceptions=2E?=
Message-ID: <3Xsl1S2n8xzM5p@mail.python.org>

http://hg.python.org/cpython/rev/5216c392239a
changeset:   80154:5216c392239a
parent:      80151:e67c8803cd82
parent:      80153:23ebe277e982
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 13:43:43 2012 +0200
summary:
  Merge: change docstring for xdrlib.Error to use new style exceptions.

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


diff --git a/Lib/xdrlib.py b/Lib/xdrlib.py
--- a/Lib/xdrlib.py
+++ b/Lib/xdrlib.py
@@ -13,7 +13,7 @@
 class Error(Exception):
     """Exception class for this module. Use:
 
-    except xdrlib.Error, var:
+    except xdrlib.Error as var:
         # var has the Error instance for the exception
 
     Public ivars:

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

From python-checkins at python.org  Thu Nov  1 13:52:16 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 13:52:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MjE4?=
 =?utf-8?q?=3A_Support_non_ascii_characters_in_python_launcher=2E?=
Message-ID: <3XsmXJ59rxzR3M@mail.python.org>

http://hg.python.org/cpython/rev/02d25098ad57
changeset:   80155:02d25098ad57
branch:      3.3
parent:      80153:23ebe277e982
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 14:51:14 2012 +0200
summary:
  Issue #16218: Support non ascii characters in python launcher.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_cmd_line_script.py |  9 +++++++++
  Python/pythonrun.c               |  9 +++++++--
  2 files changed, 16 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,6 +363,15 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
+    def test_non_utf8(self):
+        # Issue #16218
+        with temp_dir() as script_dir:
+            script_name = _make_test_script(script_dir,
+                    '\udcf1\udcea\udcf0\udce8\udcef\udcf2')
+            self._check_script(script_name, script_name, script_name,
+                               script_dir, None,
+                               importlib.machinery.SourceFileLoader)
+
 def test_main():
     support.run_unittest(CmdLineTest)
     support.reap_children()
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1358,16 +1358,21 @@
 {
     PyInterpreterState *interp;
     PyThreadState *tstate;
-    PyObject *loader_type, *loader;
+    PyObject *filename_obj, *loader_type, *loader;
     int result = 0;
+
+    filename_obj = PyUnicode_DecodeFSDefault(filename);
+    if (filename_obj == NULL)
+        return -1;
     /* Get current thread state and interpreter pointer */
     tstate = PyThreadState_GET();
     interp = tstate->interp;
     loader_type = PyObject_GetAttrString(interp->importlib, loader_name);
     if (loader_type == NULL) {
+        Py_DECREF(filename_obj);
         return -1;
     }
-    loader = PyObject_CallFunction(loader_type, "ss", "__main__", filename);
+    loader = PyObject_CallFunction(loader_type, "sN", "__main__", filename_obj);
     Py_DECREF(loader_type);
     if (loader == NULL) {
         return -1;

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

From python-checkins at python.org  Thu Nov  1 13:52:18 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 13:52:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316218=3A_Support_non_ascii_characters_in_?=
 =?utf-8?q?python_launcher=2E?=
Message-ID: <3XsmXL0V4tzNbh@mail.python.org>

http://hg.python.org/cpython/rev/1267d64c14b3
changeset:   80156:1267d64c14b3
parent:      80154:5216c392239a
parent:      80155:02d25098ad57
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 14:52:03 2012 +0200
summary:
  Merge issue #16218: Support non ascii characters in python launcher.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_cmd_line_script.py |  9 +++++++++
  Python/pythonrun.c               |  9 +++++++--
  2 files changed, 16 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,6 +363,15 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
+    def test_non_utf8(self):
+        # Issue #16218
+        with temp_dir() as script_dir:
+            script_name = _make_test_script(script_dir,
+                    '\udcf1\udcea\udcf0\udce8\udcef\udcf2')
+            self._check_script(script_name, script_name, script_name,
+                               script_dir, None,
+                               importlib.machinery.SourceFileLoader)
+
 def test_main():
     support.run_unittest(CmdLineTest)
     support.reap_children()
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1358,16 +1358,21 @@
 {
     PyInterpreterState *interp;
     PyThreadState *tstate;
-    PyObject *loader_type, *loader;
+    PyObject *filename_obj, *loader_type, *loader;
     int result = 0;
+
+    filename_obj = PyUnicode_DecodeFSDefault(filename);
+    if (filename_obj == NULL)
+        return -1;
     /* Get current thread state and interpreter pointer */
     tstate = PyThreadState_GET();
     interp = tstate->interp;
     loader_type = PyObject_GetAttrString(interp->importlib, loader_name);
     if (loader_type == NULL) {
+        Py_DECREF(filename_obj);
         return -1;
     }
-    loader = PyObject_CallFunction(loader_type, "ss", "__main__", filename);
+    loader = PyObject_CallFunction(loader_type, "sN", "__main__", filename_obj);
     Py_DECREF(loader_type);
     if (loader == NULL) {
         return -1;

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

From python-checkins at python.org  Thu Nov  1 20:04:07 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:04:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjI4?=
 =?utf-8?q?=3A_Fix_a_crash_in_the_json_module_where_a_list_changes_size_wh?=
 =?utf-8?q?ile_it?=
Message-ID: <3XswnM465BzPWM@mail.python.org>

http://hg.python.org/cpython/rev/3672db224eb3
changeset:   80157:3672db224eb3
branch:      3.2
parent:      80152:e95e647040de
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 19:52:06 2012 +0100
summary:
  Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded.
Patch by Serhiy Storchaka.

files:
  Lib/test/json_tests/test_dump.py |   8 ++++++++
  Misc/NEWS                        |   3 +++
  Modules/_json.c                  |  10 +++-------
  3 files changed, 14 insertions(+), 7 deletions(-)


diff --git a/Lib/test/json_tests/test_dump.py b/Lib/test/json_tests/test_dump.py
--- a/Lib/test/json_tests/test_dump.py
+++ b/Lib/test/json_tests/test_dump.py
@@ -19,6 +19,14 @@
                 {2: 3.0, 4.0: 5, False: 1, 6: True}, sort_keys=True),
                 '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
 
+    # Issue 16228: Crash on encoding resized list
+    def test_encode_mutated(self):
+        a = [object()] * 10
+        def crasher(obj):
+            del a[-1]
+        self.assertEqual(self.dumps(a, default=crasher),
+                 '[null, null, null, null, null]')
+
 
 class TestPyDump(TestDump, PyTest): pass
 class TestCDump(TestDump, CTest): pass
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #16228: Fix a crash in the json module where a list changes size
+  while it is being encoded.  Patch by Serhiy Storchaka.
+
 - Issue #14897: Enhance error messages of struct.pack and
   struct.pack_into. Patch by Matti M?ki.
 
diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1585,8 +1585,6 @@
     static PyObject *empty_array = NULL;
     PyObject *ident = NULL;
     PyObject *s_fast = NULL;
-    Py_ssize_t num_items;
-    PyObject **seq_items;
     Py_ssize_t i;
 
     if (open_array == NULL || close_array == NULL || empty_array == NULL) {
@@ -1600,8 +1598,7 @@
     s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
     if (s_fast == NULL)
         return -1;
-    num_items = PySequence_Fast_GET_SIZE(s_fast);
-    if (num_items == 0) {
+    if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
         Py_DECREF(s_fast);
         return PyList_Append(rval, empty_array);
     }
@@ -1622,7 +1619,6 @@
         }
     }
 
-    seq_items = PySequence_Fast_ITEMS(s_fast);
     if (PyList_Append(rval, open_array))
         goto bail;
     if (s->indent != Py_None) {
@@ -1634,8 +1630,8 @@
             buf += newline_indent
         */
     }
-    for (i = 0; i < num_items; i++) {
-        PyObject *obj = seq_items[i];
+    for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
+        PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
         if (i) {
             if (PyList_Append(rval, s->item_separator))
                 goto bail;

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

From python-checkins at python.org  Thu Nov  1 20:04:08 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:04:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316228=3A_Fix_a_crash_in_the_json_module_where_a_list_?=
 =?utf-8?q?changes_size_while_it?=
Message-ID: <3XswnN6ZVQzPkt@mail.python.org>

http://hg.python.org/cpython/rev/7528c02b8d52
changeset:   80158:7528c02b8d52
branch:      3.3
parent:      80155:02d25098ad57
parent:      80157:3672db224eb3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 19:59:21 2012 +0100
summary:
  Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded.
Patch by Serhiy Storchaka.

files:
  Lib/test/json_tests/test_dump.py |   8 ++++++++
  Misc/NEWS                        |   3 +++
  Modules/_json.c                  |  10 +++-------
  3 files changed, 14 insertions(+), 7 deletions(-)


diff --git a/Lib/test/json_tests/test_dump.py b/Lib/test/json_tests/test_dump.py
--- a/Lib/test/json_tests/test_dump.py
+++ b/Lib/test/json_tests/test_dump.py
@@ -20,6 +20,14 @@
                 {2: 3.0, 4.0: 5, False: 1, 6: True}, sort_keys=True),
                 '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
 
+    # Issue 16228: Crash on encoding resized list
+    def test_encode_mutated(self):
+        a = [object()] * 10
+        def crasher(obj):
+            del a[-1]
+        self.assertEqual(self.dumps(a, default=crasher),
+                 '[null, null, null, null, null]')
+
 
 class TestPyDump(TestDump, PyTest): pass
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@
 Library
 -------
 
+- Issue #16228: Fix a crash in the json module where a list changes size
+  while it is being encoded.  Patch by Serhiy Storchaka.
+
 - Issue #14897: Enhance error messages of struct.pack and
   struct.pack_into. Patch by Matti M?ki.
 
diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1660,8 +1660,6 @@
     static PyObject *empty_array = NULL;
     PyObject *ident = NULL;
     PyObject *s_fast = NULL;
-    Py_ssize_t num_items;
-    PyObject **seq_items;
     Py_ssize_t i;
 
     if (open_array == NULL || close_array == NULL || empty_array == NULL) {
@@ -1675,8 +1673,7 @@
     s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
     if (s_fast == NULL)
         return -1;
-    num_items = PySequence_Fast_GET_SIZE(s_fast);
-    if (num_items == 0) {
+    if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
         Py_DECREF(s_fast);
         return _PyAccu_Accumulate(acc, empty_array);
     }
@@ -1697,7 +1694,6 @@
         }
     }
 
-    seq_items = PySequence_Fast_ITEMS(s_fast);
     if (_PyAccu_Accumulate(acc, open_array))
         goto bail;
     if (s->indent != Py_None) {
@@ -1709,8 +1705,8 @@
             buf += newline_indent
         */
     }
-    for (i = 0; i < num_items; i++) {
-        PyObject *obj = seq_items[i];
+    for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
+        PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
         if (i) {
             if (_PyAccu_Accumulate(acc, s->item_separator))
                 goto bail;

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

From python-checkins at python.org  Thu Nov  1 20:04:10 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:04:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316228=3A_Fix_a_crash_in_the_json_module_where_a?=
 =?utf-8?q?_list_changes_size_while_it?=
Message-ID: <3XswnQ1g6KzPyK@mail.python.org>

http://hg.python.org/cpython/rev/ab65509b8443
changeset:   80159:ab65509b8443
parent:      80156:1267d64c14b3
parent:      80158:7528c02b8d52
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 20:03:30 2012 +0100
summary:
  Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded.
Patch by Serhiy Storchaka.

files:
  Lib/test/json_tests/test_dump.py |   8 ++++++++
  Misc/NEWS                        |   3 +++
  Modules/_json.c                  |  10 +++-------
  3 files changed, 14 insertions(+), 7 deletions(-)


diff --git a/Lib/test/json_tests/test_dump.py b/Lib/test/json_tests/test_dump.py
--- a/Lib/test/json_tests/test_dump.py
+++ b/Lib/test/json_tests/test_dump.py
@@ -20,6 +20,14 @@
                 {2: 3.0, 4.0: 5, False: 1, 6: True}, sort_keys=True),
                 '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
 
+    # Issue 16228: Crash on encoding resized list
+    def test_encode_mutated(self):
+        a = [object()] * 10
+        def crasher(obj):
+            del a[-1]
+        self.assertEqual(self.dumps(a, default=crasher),
+                 '[null, null, null, null, null]')
+
 
 class TestPyDump(TestDump, PyTest): pass
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,9 @@
 Library
 -------
 
+- Issue #16228: Fix a crash in the json module where a list changes size
+  while it is being encoded.  Patch by Serhiy Storchaka.
+
 - Issue #16351: New function gc.get_stats() returns per-generation collection
   statistics.
 
diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1659,8 +1659,6 @@
     static PyObject *empty_array = NULL;
     PyObject *ident = NULL;
     PyObject *s_fast = NULL;
-    Py_ssize_t num_items;
-    PyObject **seq_items;
     Py_ssize_t i;
 
     if (open_array == NULL || close_array == NULL || empty_array == NULL) {
@@ -1674,8 +1672,7 @@
     s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
     if (s_fast == NULL)
         return -1;
-    num_items = PySequence_Fast_GET_SIZE(s_fast);
-    if (num_items == 0) {
+    if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
         Py_DECREF(s_fast);
         return _PyAccu_Accumulate(acc, empty_array);
     }
@@ -1696,7 +1693,6 @@
         }
     }
 
-    seq_items = PySequence_Fast_ITEMS(s_fast);
     if (_PyAccu_Accumulate(acc, open_array))
         goto bail;
     if (s->indent != Py_None) {
@@ -1708,8 +1704,8 @@
             buf += newline_indent
         */
     }
-    for (i = 0; i < num_items; i++) {
-        PyObject *obj = seq_items[i];
+    for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
+        PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
         if (i) {
             if (_PyAccu_Accumulate(acc, s->item_separator))
                 goto bail;

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

From python-checkins at python.org  Thu Nov  1 20:08:21 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:08:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjI4?=
 =?utf-8?q?=3A_Fix_a_crash_in_the_json_module_where_a_list_changes_size_wh?=
 =?utf-8?q?ile_it?=
Message-ID: <3XswtF095yzQkG@mail.python.org>

http://hg.python.org/cpython/rev/33ae62a4ecf5
changeset:   80160:33ae62a4ecf5
branch:      2.7
parent:      80136:8296b686c6de
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 20:07:40 2012 +0100
summary:
  Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded.
Patch by Serhiy Storchaka.

files:
  Lib/json/tests/test_dump.py |   9 +++++++++
  Misc/NEWS                   |   3 +++
  Modules/_json.c             |  10 +++-------
  3 files changed, 15 insertions(+), 7 deletions(-)


diff --git a/Lib/json/tests/test_dump.py b/Lib/json/tests/test_dump.py
--- a/Lib/json/tests/test_dump.py
+++ b/Lib/json/tests/test_dump.py
@@ -19,5 +19,14 @@
                 {2: 3.0, 4.0: 5L, False: 1, 6L: True}, sort_keys=True),
                 '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
 
+    # Issue 16228: Crash on encoding resized list
+    def test_encode_mutated(self):
+        a = [object()] * 10
+        def crasher(obj):
+            del a[-1]
+        self.assertEqual(self.dumps(a, default=crasher),
+                 '[null, null, null, null, null]')
+
+
 class TestPyDump(TestDump, PyTest): pass
 class TestCDump(TestDump, CTest): pass
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@
 Library
 -------
 
+- Issue #16228: Fix a crash in the json module where a list changes size
+  while it is being encoded.  Patch by Serhiy Storchaka.
+
 - Issue #14897: Enhance error messages of struct.pack and
   struct.pack_into. Patch by Matti M?ki.
 
diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -2224,8 +2224,6 @@
     static PyObject *empty_array = NULL;
     PyObject *ident = NULL;
     PyObject *s_fast = NULL;
-    Py_ssize_t num_items;
-    PyObject **seq_items;
     Py_ssize_t i;
 
     if (open_array == NULL || close_array == NULL || empty_array == NULL) {
@@ -2239,8 +2237,7 @@
     s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
     if (s_fast == NULL)
         return -1;
-    num_items = PySequence_Fast_GET_SIZE(s_fast);
-    if (num_items == 0) {
+    if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
         Py_DECREF(s_fast);
         return PyList_Append(rval, empty_array);
     }
@@ -2261,7 +2258,6 @@
         }
     }
 
-    seq_items = PySequence_Fast_ITEMS(s_fast);
     if (PyList_Append(rval, open_array))
         goto bail;
     if (s->indent != Py_None) {
@@ -2273,8 +2269,8 @@
             buf += newline_indent
         */
     }
-    for (i = 0; i < num_items; i++) {
-        PyObject *obj = seq_items[i];
+    for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
+        PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
         if (i) {
             if (PyList_Append(rval, s->item_separator))
                 goto bail;

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

From python-checkins at python.org  Thu Nov  1 20:20:33 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:20:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MjMw?=
 =?utf-8?q?=3A_Fix_a_crash_in_select=2Eselect=28=29_when_one_the_lists_cha?=
 =?utf-8?q?nges_size?=
Message-ID: <3Xsx8K56d3zNJQ@mail.python.org>

http://hg.python.org/cpython/rev/87ccf2635ad7
changeset:   80161:87ccf2635ad7
branch:      3.2
parent:      80157:3672db224eb3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 20:13:54 2012 +0100
summary:
  Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on.
Patch by Serhiy Storchaka.

files:
  Lib/test/test_select.py |  10 ++++++++++
  Misc/NEWS               |   3 +++
  Modules/selectmodule.c  |   6 ++----
  3 files changed, 15 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -49,6 +49,16 @@
             self.fail('Unexpected return values from select():', rfd, wfd, xfd)
         p.close()
 
+    # Issue 16230: Crash on select resized list
+    def test_select_mutated(self):
+        a = []
+        class F:
+            def fileno(self):
+                del a[-1]
+                return sys.__stdout__.fileno()
+        a[:] = [F()] * 10
+        self.assertEqual(select.select([], a, []), ([], a[:5], []))
+
 def test_main():
     support.run_unittest(SelectTestCase)
     support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #16230: Fix a crash in select.select() when one the lists changes
+  size while iterated on.  Patch by Serhiy Storchaka.
+
 - Issue #16228: Fix a crash in the json module where a list changes size
   while it is being encoded.  Patch by Serhiy Storchaka.
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -83,7 +83,7 @@
 {
     int max = -1;
     int index = 0;
-    Py_ssize_t i, len = -1;
+    Py_ssize_t i;
     PyObject* fast_seq = NULL;
     PyObject* o = NULL;
 
@@ -94,9 +94,7 @@
     if (!fast_seq)
         return -1;
 
-    len = PySequence_Fast_GET_SIZE(fast_seq);
-
-    for (i = 0; i < len; i++)  {
+    for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++)  {
         SOCKET v;
 
         /* any intervening fileno() calls could decr this refcnt */

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

From python-checkins at python.org  Thu Nov  1 20:20:35 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:20:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316230=3A_Fix_a_crash_in_select=2Eselect=28=29_when_on?=
 =?utf-8?q?e_the_lists_changes_size?=
Message-ID: <3Xsx8M0XdrzPlS@mail.python.org>

http://hg.python.org/cpython/rev/717660ec8f67
changeset:   80162:717660ec8f67
branch:      3.3
parent:      80158:7528c02b8d52
parent:      80161:87ccf2635ad7
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 20:15:23 2012 +0100
summary:
  Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on.
Patch by Serhiy Storchaka.

files:
  Lib/test/test_select.py |  10 ++++++++++
  Misc/NEWS               |   3 +++
  Modules/selectmodule.c  |   6 ++----
  3 files changed, 15 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -65,6 +65,16 @@
             self.fail('Unexpected return values from select():', rfd, wfd, xfd)
         p.close()
 
+    # Issue 16230: Crash on select resized list
+    def test_select_mutated(self):
+        a = []
+        class F:
+            def fileno(self):
+                del a[-1]
+                return sys.__stdout__.fileno()
+        a[:] = [F()] * 10
+        self.assertEqual(select.select([], a, []), ([], a[:5], []))
+
 def test_main():
     support.run_unittest(SelectTestCase)
     support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@
 Library
 -------
 
+- Issue #16230: Fix a crash in select.select() when one the lists changes
+  size while iterated on.  Patch by Serhiy Storchaka.
+
 - Issue #16228: Fix a crash in the json module where a list changes size
   while it is being encoded.  Patch by Serhiy Storchaka.
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -89,7 +89,7 @@
 {
     int max = -1;
     int index = 0;
-    Py_ssize_t i, len = -1;
+    Py_ssize_t i;
     PyObject* fast_seq = NULL;
     PyObject* o = NULL;
 
@@ -100,9 +100,7 @@
     if (!fast_seq)
         return -1;
 
-    len = PySequence_Fast_GET_SIZE(fast_seq);
-
-    for (i = 0; i < len; i++)  {
+    for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++)  {
         SOCKET v;
 
         /* any intervening fileno() calls could decr this refcnt */

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

From python-checkins at python.org  Thu Nov  1 20:20:36 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:20:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316230=3A_Fix_a_crash_in_select=2Eselect=28=29_w?=
 =?utf-8?q?hen_one_the_lists_changes_size?=
Message-ID: <3Xsx8N2gwGzPwh@mail.python.org>

http://hg.python.org/cpython/rev/823898ef37ce
changeset:   80163:823898ef37ce
parent:      80159:ab65509b8443
parent:      80162:717660ec8f67
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 20:16:07 2012 +0100
summary:
  Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on.
Patch by Serhiy Storchaka.

files:
  Lib/test/test_select.py |  10 ++++++++++
  Misc/NEWS               |   3 +++
  Modules/selectmodule.c  |   6 ++----
  3 files changed, 15 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -65,6 +65,16 @@
             self.fail('Unexpected return values from select():', rfd, wfd, xfd)
         p.close()
 
+    # Issue 16230: Crash on select resized list
+    def test_select_mutated(self):
+        a = []
+        class F:
+            def fileno(self):
+                del a[-1]
+                return sys.__stdout__.fileno()
+        a[:] = [F()] * 10
+        self.assertEqual(select.select([], a, []), ([], a[:5], []))
+
 def test_main():
     support.run_unittest(SelectTestCase)
     support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,9 @@
 Library
 -------
 
+- Issue #16230: Fix a crash in select.select() when one the lists changes
+  size while iterated on.  Patch by Serhiy Storchaka.
+
 - Issue #16228: Fix a crash in the json module where a list changes size
   while it is being encoded.  Patch by Serhiy Storchaka.
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -84,7 +84,7 @@
 {
     int max = -1;
     int index = 0;
-    Py_ssize_t i, len = -1;
+    Py_ssize_t i;
     PyObject* fast_seq = NULL;
     PyObject* o = NULL;
 
@@ -95,9 +95,7 @@
     if (!fast_seq)
         return -1;
 
-    len = PySequence_Fast_GET_SIZE(fast_seq);
-
-    for (i = 0; i < len; i++)  {
+    for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++)  {
         SOCKET v;
 
         /* any intervening fileno() calls could decr this refcnt */

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

From python-checkins at python.org  Thu Nov  1 20:20:37 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  1 Nov 2012 20:20:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MjMw?=
 =?utf-8?q?=3A_Fix_a_crash_in_select=2Eselect=28=29_when_one_the_lists_cha?=
 =?utf-8?q?nges_size?=
Message-ID: <3Xsx8P54SPzPyB@mail.python.org>

http://hg.python.org/cpython/rev/02a5322b0cee
changeset:   80164:02a5322b0cee
branch:      2.7
parent:      80160:33ae62a4ecf5
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Nov 01 20:13:54 2012 +0100
summary:
  Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on.
Patch by Serhiy Storchaka.

files:
  Lib/test/test_select.py |  9 +++++++++
  Misc/NEWS               |  3 +++
  Modules/selectmodule.c  |  5 +----
  3 files changed, 13 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -49,6 +49,15 @@
             self.fail('Unexpected return values from select():', rfd, wfd, xfd)
         p.close()
 
+    # Issue 16230: Crash on select resized list
+    def test_select_mutated(self):
+        a = []
+        class F:
+            def fileno(self):
+                del a[-1]
+                return sys.__stdout__.fileno()
+        a[:] = [F()] * 10
+        self.assertEqual(select.select([], a, []), ([], a[:5], []))
 
 def test_main():
     test_support.run_unittest(SelectTestCase)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@
 Library
 -------
 
+- Issue #16230: Fix a crash in select.select() when one the lists changes
+  size while iterated on.  Patch by Serhiy Storchaka.
+
 - Issue #16228: Fix a crash in the json module where a list changes size
   while it is being encoded.  Patch by Serhiy Storchaka.
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -87,7 +87,6 @@
     int i;
     int max = -1;
     int index = 0;
-    int len = -1;
     PyObject* fast_seq = NULL;
     PyObject* o = NULL;
 
@@ -98,9 +97,7 @@
     if (!fast_seq)
         return -1;
 
-    len = PySequence_Fast_GET_SIZE(fast_seq);
-
-    for (i = 0; i < len; i++)  {
+    for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++)  {
         SOCKET v;
 
         /* any intervening fileno() calls could decr this refcnt */

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

From python-checkins at python.org  Thu Nov  1 20:28:51 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:28:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0ODkz?=
 =?utf-8?q?=3A_Add_function_annotation_example_to_function_tutorial=2E?=
Message-ID: <3XsxKv69jbzPb8@mail.python.org>

http://hg.python.org/cpython/rev/2bf99322218f
changeset:   80165:2bf99322218f
branch:      3.2
parent:      80161:87ccf2635ad7
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:26:55 2012 +0200
summary:
  Issue #14893: Add function annotation example to function tutorial.

Patch by Zachary Ware.

files:
  Doc/tutorial/controlflow.rst |  34 ++++++++++++++++++++++++
  1 files changed, 34 insertions(+), 0 deletions(-)


diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -656,6 +656,40 @@
        No, really, it doesn't do anything.
 
 
+.. _tut-annotations:
+
+Function Annotations
+--------------------
+
+.. sectionauthor:: Zachary Ware <zachary.ware at gmail.com>
+.. index::
+   pair: function; annotations
+   single: -> (return annotation assignment)
+
+:ref:`Function annotations <function>` are completely optional,
+arbitrary metadata information about user-defined functions.  Neither Python
+itself nor the standard library use function annotations in any way; this
+section just shows the syntax. Third-party projects are free to use function
+annotations for documentation, type checking, and other uses.
+
+Annotations are stored in the :attr:`__annotations__` attribute of the function
+as a dictionary and have no effect on any other part of the function.  Parameter
+annotations are defined by a colon after the parameter name, followed by an
+expression evaluating to the value of the annotation.  Return annotations are
+defined by a literal ``->``, followed by an expression, between the parameter
+list and the colon denoting the end of the :keyword:`def` statement.  The
+following example has a positional argument, a keyword argument, and the return
+value annotated with nonsense::
+
+   >>> def f(ham: 42, eggs: int = 'spam') -> "Nothing to see here":
+   ...     print("Annotations:", f.__annotations__)
+   ...     print("Arguments:", ham, eggs)
+   ...
+   >>> f('wonderful')
+   Annotations: {'eggs': <class 'int'>, 'return': 'Nothing to see here', 'ham': 42}
+   Arguments: wonderful spam
+
+
 .. _tut-codingstyle:
 
 Intermezzo: Coding Style

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

From python-checkins at python.org  Thu Nov  1 20:28:53 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:28:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=2314893=3A_Add_function_annotation_example_to_fun?=
 =?utf-8?q?ction_tutorial=2E?=
Message-ID: <3XsxKx1cSNzPyB@mail.python.org>

http://hg.python.org/cpython/rev/45167091b5f9
changeset:   80166:45167091b5f9
branch:      3.3
parent:      80162:717660ec8f67
parent:      80165:2bf99322218f
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:27:23 2012 +0200
summary:
  Merge issue #14893: Add function annotation example to function tutorial.

Patch by Zachary Ware.

files:
  Doc/tutorial/controlflow.rst |  34 ++++++++++++++++++++++++
  1 files changed, 34 insertions(+), 0 deletions(-)


diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -656,6 +656,40 @@
        No, really, it doesn't do anything.
 
 
+.. _tut-annotations:
+
+Function Annotations
+--------------------
+
+.. sectionauthor:: Zachary Ware <zachary.ware at gmail.com>
+.. index::
+   pair: function; annotations
+   single: -> (return annotation assignment)
+
+:ref:`Function annotations <function>` are completely optional,
+arbitrary metadata information about user-defined functions.  Neither Python
+itself nor the standard library use function annotations in any way; this
+section just shows the syntax. Third-party projects are free to use function
+annotations for documentation, type checking, and other uses.
+
+Annotations are stored in the :attr:`__annotations__` attribute of the function
+as a dictionary and have no effect on any other part of the function.  Parameter
+annotations are defined by a colon after the parameter name, followed by an
+expression evaluating to the value of the annotation.  Return annotations are
+defined by a literal ``->``, followed by an expression, between the parameter
+list and the colon denoting the end of the :keyword:`def` statement.  The
+following example has a positional argument, a keyword argument, and the return
+value annotated with nonsense::
+
+   >>> def f(ham: 42, eggs: int = 'spam') -> "Nothing to see here":
+   ...     print("Annotations:", f.__annotations__)
+   ...     print("Arguments:", ham, eggs)
+   ...
+   >>> f('wonderful')
+   Annotations: {'eggs': <class 'int'>, 'return': 'Nothing to see here', 'ham': 42}
+   Arguments: wonderful spam
+
+
 .. _tut-codingstyle:
 
 Intermezzo: Coding Style

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

From python-checkins at python.org  Thu Nov  1 20:28:54 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:28:54 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2314893=3A_Add_function_annotation_example_?=
 =?utf-8?q?to_function_tutorial=2E?=
Message-ID: <3XsxKy3yHJzPyB@mail.python.org>

http://hg.python.org/cpython/rev/63b495ff366b
changeset:   80167:63b495ff366b
parent:      80163:823898ef37ce
parent:      80166:45167091b5f9
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:28:40 2012 +0200
summary:
  Merge issue #14893: Add function annotation example to function tutorial.

Patch by Zachary Ware.

files:
  Doc/tutorial/controlflow.rst |  34 ++++++++++++++++++++++++
  1 files changed, 34 insertions(+), 0 deletions(-)


diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -656,6 +656,40 @@
        No, really, it doesn't do anything.
 
 
+.. _tut-annotations:
+
+Function Annotations
+--------------------
+
+.. sectionauthor:: Zachary Ware <zachary.ware at gmail.com>
+.. index::
+   pair: function; annotations
+   single: -> (return annotation assignment)
+
+:ref:`Function annotations <function>` are completely optional,
+arbitrary metadata information about user-defined functions.  Neither Python
+itself nor the standard library use function annotations in any way; this
+section just shows the syntax. Third-party projects are free to use function
+annotations for documentation, type checking, and other uses.
+
+Annotations are stored in the :attr:`__annotations__` attribute of the function
+as a dictionary and have no effect on any other part of the function.  Parameter
+annotations are defined by a colon after the parameter name, followed by an
+expression evaluating to the value of the annotation.  Return annotations are
+defined by a literal ``->``, followed by an expression, between the parameter
+list and the colon denoting the end of the :keyword:`def` statement.  The
+following example has a positional argument, a keyword argument, and the return
+value annotated with nonsense::
+
+   >>> def f(ham: 42, eggs: int = 'spam') -> "Nothing to see here":
+   ...     print("Annotations:", f.__annotations__)
+   ...     print("Arguments:", ham, eggs)
+   ...
+   >>> f('wonderful')
+   Annotations: {'eggs': <class 'int'>, 'return': 'Nothing to see here', 'ham': 42}
+   Arguments: wonderful spam
+
+
 .. _tut-codingstyle:
 
 Intermezzo: Coding Style

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

From python-checkins at python.org  Thu Nov  1 20:48:44 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:48:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Reword_set_doc?=
 =?utf-8?q?s_to_use_*proper_subset/superset*_terminology=2E?=
Message-ID: <3Xsxmr5P5XzPlS@mail.python.org>

http://hg.python.org/cpython/rev/7dda9dc5e830
changeset:   80168:7dda9dc5e830
branch:      2.7
parent:      80164:02a5322b0cee
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:47:05 2012 +0200
summary:
  Reword set docs to use *proper subset/superset* terminology.

files:
  Doc/library/stdtypes.rst |  4 ++--
  1 files changed, 2 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
@@ -1771,7 +1771,7 @@
 
    .. method:: set < other
 
-      Test whether the set is a true subset of *other*, that is,
+      Test whether the set is a proper subset of *other*, that is,
       ``set <= other and set != other``.
 
    .. method:: issuperset(other)
@@ -1781,7 +1781,7 @@
 
    .. method:: set > other
 
-      Test whether the set is a true superset of *other*, that is, ``set >=
+      Test whether the set is a proper superset of *other*, that is, ``set >=
       other and set != other``.
 
    .. method:: union(other, ...)

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

From python-checkins at python.org  Thu Nov  1 20:48:46 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:48:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Reword_set_doc?=
 =?utf-8?q?s_to_use_*proper_subset/superset*_terminology=2E?=
Message-ID: <3Xsxmt0mMqzPnk@mail.python.org>

http://hg.python.org/cpython/rev/fa7311caa203
changeset:   80169:fa7311caa203
branch:      3.2
parent:      80165:2bf99322218f
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:47:54 2012 +0200
summary:
  Reword set docs to use *proper subset/superset* terminology.

files:
  Doc/library/stdtypes.rst |  4 ++--
  1 files changed, 2 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
@@ -1954,7 +1954,7 @@
 
    .. method:: set < other
 
-      Test whether the set is a true subset of *other*, that is,
+      Test whether the set is a proper subset of *other*, that is,
       ``set <= other and set != other``.
 
    .. method:: issuperset(other)
@@ -1964,7 +1964,7 @@
 
    .. method:: set > other
 
-      Test whether the set is a true superset of *other*, that is, ``set >=
+      Test whether the set is a proper superset of *other*, that is, ``set >=
       other and set != other``.
 
    .. method:: union(other, ...)

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

From python-checkins at python.org  Thu Nov  1 20:48:47 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:48:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge=3A_Reword_set_docs_to_use_*proper_subset/superset*_termi?=
 =?utf-8?q?nology=2E?=
Message-ID: <3Xsxmv2xvYzPtf@mail.python.org>

http://hg.python.org/cpython/rev/95a4c7d02309
changeset:   80170:95a4c7d02309
branch:      3.3
parent:      80166:45167091b5f9
parent:      80169:fa7311caa203
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:48:16 2012 +0200
summary:
  Merge: Reword set docs to use *proper subset/superset* terminology.

files:
  Doc/library/stdtypes.rst |  4 ++--
  1 files changed, 2 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
@@ -2793,7 +2793,7 @@
 
    .. method:: set < other
 
-      Test whether the set is a true subset of *other*, that is,
+      Test whether the set is a proper subset of *other*, that is,
       ``set <= other and set != other``.
 
    .. method:: issuperset(other)
@@ -2803,7 +2803,7 @@
 
    .. method:: set > other
 
-      Test whether the set is a true superset of *other*, that is, ``set >=
+      Test whether the set is a proper superset of *other*, that is, ``set >=
       other and set != other``.
 
    .. method:: union(other, ...)

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

From python-checkins at python.org  Thu Nov  1 20:48:48 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 20:48:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Reword_set_docs_to_use_*proper_subset/superset*?=
 =?utf-8?q?_terminology=2E?=
Message-ID: <3Xsxmw56JtzPtj@mail.python.org>

http://hg.python.org/cpython/rev/56c3ab6f7f07
changeset:   80171:56c3ab6f7f07
parent:      80167:63b495ff366b
parent:      80170:95a4c7d02309
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 21:48:34 2012 +0200
summary:
  Merge: Reword set docs to use *proper subset/superset* terminology.

files:
  Doc/library/stdtypes.rst |  4 ++--
  1 files changed, 2 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
@@ -2793,7 +2793,7 @@
 
    .. method:: set < other
 
-      Test whether the set is a true subset of *other*, that is,
+      Test whether the set is a proper subset of *other*, that is,
       ``set <= other and set != other``.
 
    .. method:: issuperset(other)
@@ -2803,7 +2803,7 @@
 
    .. method:: set > other
 
-      Test whether the set is a true superset of *other*, that is, ``set >=
+      Test whether the set is a proper superset of *other*, that is, ``set >=
       other and set != other``.
 
    .. method:: union(other, ...)

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

From python-checkins at python.org  Thu Nov  1 21:44:59 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 21:44:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyMDc1?=
 =?utf-8?q?89=3A_Add_Cut/Copy/Paste_items_to_IDLE_right_click_Context_Menu?=
Message-ID: <3Xsz1l1vxfzMXv@mail.python.org>

http://hg.python.org/cpython/rev/639dd6e62de4
changeset:   80172:639dd6e62de4
branch:      2.7
parent:      80168:7dda9dc5e830
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 22:39:14 2012 +0200
summary:
  Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu

 Patch by Todd Rovito.

files:
  Doc/library/idle.rst        |  21 ++++++++++++
  Lib/idlelib/EditorWindow.py |  42 ++++++++++++++++++++----
  Lib/idlelib/OutputWindow.py |   6 ++-
  Lib/idlelib/PyShell.py      |  22 +++++++++++-
  Lib/idlelib/help.txt        |  15 +++++++-
  Misc/NEWS                   |   3 +
  6 files changed, 96 insertions(+), 13 deletions(-)


diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -183,6 +183,15 @@
 
 * Right-click in Edit window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Set Breakpoint
    Sets a breakpoint.  Breakpoints are only enabled when the debugger is open.
 
@@ -190,6 +199,9 @@
    Clears the breakpoint on that line.
 
 .. index::
+   single: Cut
+   single: Copy
+   single: Paste
    single: Set Breakpoint
    single: Clear Breakpoint
    single: breakpoints
@@ -200,6 +212,15 @@
 
 * Right-click in Python Shell window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Go to file/line
    Same as in Debug menu.
 
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -470,7 +470,6 @@
     rmenu = None
 
     def right_menu_event(self, event):
-        self.text.tag_remove("sel", "1.0", "end")
         self.text.mark_set("insert", "@%d,%d" % (event.x, event.y))
         if not self.rmenu:
             self.make_rmenu()
@@ -479,23 +478,52 @@
         iswin = sys.platform[:3] == 'win'
         if iswin:
             self.text.config(cursor="arrow")
+
+        for label, eventname, verify_state in self.rmenu_specs:
+            if verify_state is None:
+                continue
+            state = getattr(self, verify_state)()
+            rmenu.entryconfigure(label, state=state)
+
         rmenu.tk_popup(event.x_root, event.y_root)
         if iswin:
             self.text.config(cursor="ibeam")
 
     rmenu_specs = [
-        # ("Label", "<<virtual-event>>"), ...
-        ("Close", "<<close-window>>"), # Example
+        # ("Label", "<<virtual-event>>", "statefuncname"), ...
+        ("Close", "<<close-window>>", None), # Example
     ]
 
     def make_rmenu(self):
         rmenu = Menu(self.text, tearoff=0)
-        for label, eventname in self.rmenu_specs:
-            def command(text=self.text, eventname=eventname):
-                text.event_generate(eventname)
-            rmenu.add_command(label=label, command=command)
+        for label, eventname, _ in self.rmenu_specs:
+            if label is not None:
+                def command(text=self.text, eventname=eventname):
+                    text.event_generate(eventname)
+                rmenu.add_command(label=label, command=command)
+            else:
+                rmenu.add_separator()
         self.rmenu = rmenu
 
+    def rmenu_check_cut(self):
+        return self.rmenu_check_copy()
+
+    def rmenu_check_copy(self):
+        try:
+            indx = self.text.index('sel.first')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal' if indx else 'disabled'
+
+    def rmenu_check_paste(self):
+        try:
+            self.text.tk.call('tk::GetSelection', self.text, 'CLIPBOARD')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal'
+
     def about_dialog(self, event=None):
         aboutDialog.AboutDialog(self.top,'About IDLE')
 
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -57,7 +57,11 @@
     # Our own right-button menu
 
     rmenu_specs = [
-        ("Go to file/line", "<<goto-file-line>>"),
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Go to file/line", "<<goto-file-line>>", None),
     ]
 
     file_line_pats = [
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -122,8 +122,13 @@
             old_hook()
         self.io.set_filename_change_hook(filename_changed_hook)
 
-    rmenu_specs = [("Set Breakpoint", "<<set-breakpoint-here>>"),
-                   ("Clear Breakpoint", "<<clear-breakpoint-here>>")]
+    rmenu_specs = [
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        ("Set Breakpoint", "<<set-breakpoint-here>>", None),
+        ("Clear Breakpoint", "<<clear-breakpoint-here>>", None)
+    ]
 
     def set_breakpoint(self, lineno):
         text = self.text
@@ -1261,6 +1266,19 @@
             if not use_subprocess:
                 raise KeyboardInterrupt
 
+    def rmenu_check_cut(self):
+        try:
+            if self.text.compare('sel.first', '<', 'iomark'):
+                return 'disabled'
+        except TclError: # no selection, so the index 'sel.first' doesn't exist
+            return 'disabled'
+        return super(PyShell, self).rmenu_check_cut()
+
+    def rmenu_check_paste(self):
+        if self.text.compare('insert', '<', 'iomark'):
+            return 'disabled'
+        return super(PyShell, self).rmenu_check_paste()
+
 class PseudoFile(object):
 
     def __init__(self, shell, tags, encoding=None):
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -120,14 +120,23 @@
 	---
 	(Additional Help Sources may be added here)
 
-Edit context menu (Right-click / Control-click in Edit window):
+Edit context menu (Right-click / Control-click on OS X in Edit window):
 
+    	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
 	Set Breakpoint   -- Sets a breakpoint (when debugger open)
 	Clear Breakpoint -- Clears the breakpoint on that line
 
-Shell context menu (Right-click / Control-click in Shell window):
+Shell context menu (Right-click / Control-click on OS X in Shell window):
 
-	Go to file/line -- Same as in Debug menu
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
+        ---
+	Go to file/line  -- Same as in Debug menu
 
 
 ** TIPS **
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@
 Library
 -------
 
+- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
+  Patch by Todd Rovito.
+
 - Issue #16230: Fix a crash in select.select() when one the lists changes
   size while iterated on.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov  1 21:45:00 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 21:45:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzEyMDc1?=
 =?utf-8?q?89=3A_Add_Cut/Copy/Paste_items_to_IDLE_right_click_Context_Menu?=
Message-ID: <3Xsz1m5jHtzPs3@mail.python.org>

http://hg.python.org/cpython/rev/66643fcf6ee9
changeset:   80173:66643fcf6ee9
branch:      3.2
parent:      80169:fa7311caa203
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 22:41:19 2012 +0200
summary:
  Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu

 Patch by Todd Rovito.

files:
  Doc/library/idle.rst        |  21 ++++++++++++
  Lib/idlelib/EditorWindow.py |  43 ++++++++++++++++++++----
  Lib/idlelib/OutputWindow.py |   6 ++-
  Lib/idlelib/PyShell.py      |  23 ++++++++++++-
  Lib/idlelib/help.txt        |  15 ++++++-
  Misc/NEWS                   |   3 +
  6 files changed, 98 insertions(+), 13 deletions(-)


diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -183,6 +183,15 @@
 
 * Right-click in Edit window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Set Breakpoint
    Sets a breakpoint.  Breakpoints are only enabled when the debugger is open.
 
@@ -190,6 +199,9 @@
    Clears the breakpoint on that line.
 
 .. index::
+   single: Cut
+   single: Copy
+   single: Paste
    single: Set Breakpoint
    single: Clear Breakpoint
    single: breakpoints
@@ -200,6 +212,15 @@
 
 * Right-click in Python Shell window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Go to file/line
    Same as in Debug menu.
 
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -464,7 +464,6 @@
     rmenu = None
 
     def right_menu_event(self, event):
-        self.text.tag_remove("sel", "1.0", "end")
         self.text.mark_set("insert", "@%d,%d" % (event.x, event.y))
         if not self.rmenu:
             self.make_rmenu()
@@ -473,23 +472,53 @@
         iswin = sys.platform[:3] == 'win'
         if iswin:
             self.text.config(cursor="arrow")
+
+        for label, eventname, verify_state in self.rmenu_specs:
+            if verify_state is None:
+                continue
+            state = getattr(self, verify_state)()
+            rmenu.entryconfigure(label, state=state)
+
+
         rmenu.tk_popup(event.x_root, event.y_root)
         if iswin:
             self.text.config(cursor="ibeam")
 
     rmenu_specs = [
-        # ("Label", "<<virtual-event>>"), ...
-        ("Close", "<<close-window>>"), # Example
+        # ("Label", "<<virtual-event>>", "statefuncname"), ...
+        ("Close", "<<close-window>>", None), # Example
     ]
 
     def make_rmenu(self):
         rmenu = Menu(self.text, tearoff=0)
-        for label, eventname in self.rmenu_specs:
-            def command(text=self.text, eventname=eventname):
-                text.event_generate(eventname)
-            rmenu.add_command(label=label, command=command)
+        for label, eventname, _ in self.rmenu_specs:
+            if label is not None:
+                def command(text=self.text, eventname=eventname):
+                    text.event_generate(eventname)
+                rmenu.add_command(label=label, command=command)
+            else:
+                rmenu.add_separator()
         self.rmenu = rmenu
 
+    def rmenu_check_cut(self):
+        return self.rmenu_check_copy()
+
+    def rmenu_check_copy(self):
+        try:
+            indx = self.text.index('sel.first')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal' if indx else 'disabled'
+
+    def rmenu_check_paste(self):
+        try:
+            self.text.tk.call('tk::GetSelection', self.text, 'CLIPBOARD')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal'
+
     def about_dialog(self, event=None):
         aboutDialog.AboutDialog(self.top,'About IDLE')
 
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -52,7 +52,11 @@
     # Our own right-button menu
 
     rmenu_specs = [
-        ("Go to file/line", "<<goto-file-line>>"),
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Go to file/line", "<<goto-file-line>>", None),
     ]
 
     file_line_pats = [
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -117,8 +117,14 @@
             old_hook()
         self.io.set_filename_change_hook(filename_changed_hook)
 
-    rmenu_specs = [("Set Breakpoint", "<<set-breakpoint-here>>"),
-                   ("Clear Breakpoint", "<<clear-breakpoint-here>>")]
+    rmenu_specs = [
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Set Breakpoint", "<<set-breakpoint-here>>", None),
+        ("Clear Breakpoint", "<<clear-breakpoint-here>>", None)
+    ]
 
     def set_breakpoint(self, lineno):
         text = self.text
@@ -1240,6 +1246,19 @@
                 raise KeyboardInterrupt
         return count
 
+    def rmenu_check_cut(self):
+        try:
+            if self.text.compare('sel.first', '<', 'iomark'):
+                return 'disabled'
+        except TclError: # no selection, so the index 'sel.first' doesn't exist
+            return 'disabled'
+        return super().rmenu_check_cut()
+
+    def rmenu_check_paste(self):
+        if self.text.compare('insert','<','iomark'):
+            return 'disabled'
+        return super().rmenu_check_paste()
+
 class PseudoFile(object):
 
     def __init__(self, shell, tags, encoding=None):
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -120,14 +120,23 @@
 	---
 	(Additional Help Sources may be added here)
 
-Edit context menu (Right-click / Control-click in Edit window):
+Edit context menu (Right-click / Control-click on OS X in Edit window):
 
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
 	Set Breakpoint   -- Sets a breakpoint (when debugger open)
 	Clear Breakpoint -- Clears the breakpoint on that line
 
-Shell context menu (Right-click / Control-click in Shell window):
+Shell context menu (Right-click / Control-click on OS X in Shell window):
 
-	Go to file/line -- Same as in Debug menu
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
+	---
+	Go to file/line  -- Same as in Debug menu
 
 
 ** TIPS **
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
+  Patch by Todd Rovito.
+
 - Issue #16230: Fix a crash in select.select() when one the lists changes
   size while iterated on.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov  1 21:45:02 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 21:45:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=231207589=3A_Add_Cut/Copy/Paste_items_to_IDLE_rig?=
 =?utf-8?q?ht_click_Context_Menu?=
Message-ID: <3Xsz1p21nlzPxB@mail.python.org>

http://hg.python.org/cpython/rev/3f3b72ab9d65
changeset:   80174:3f3b72ab9d65
branch:      3.3
parent:      80170:95a4c7d02309
parent:      80173:66643fcf6ee9
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 22:44:06 2012 +0200
summary:
  Merge issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu

 Patch by Todd Rovito.

files:
  Doc/library/idle.rst        |  21 ++++++++++++
  Lib/idlelib/EditorWindow.py |  43 ++++++++++++++++++++----
  Lib/idlelib/OutputWindow.py |   6 ++-
  Lib/idlelib/PyShell.py      |  23 ++++++++++++-
  Lib/idlelib/help.txt        |  15 ++++++-
  Misc/NEWS                   |   3 +
  6 files changed, 98 insertions(+), 13 deletions(-)


diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -183,6 +183,15 @@
 
 * Right-click in Edit window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Set Breakpoint
    Sets a breakpoint.  Breakpoints are only enabled when the debugger is open.
 
@@ -190,6 +199,9 @@
    Clears the breakpoint on that line.
 
 .. index::
+   single: Cut
+   single: Copy
+   single: Paste
    single: Set Breakpoint
    single: Clear Breakpoint
    single: breakpoints
@@ -200,6 +212,15 @@
 
 * Right-click in Python Shell window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Go to file/line
    Same as in Debug menu.
 
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -464,7 +464,6 @@
     rmenu = None
 
     def right_menu_event(self, event):
-        self.text.tag_remove("sel", "1.0", "end")
         self.text.mark_set("insert", "@%d,%d" % (event.x, event.y))
         if not self.rmenu:
             self.make_rmenu()
@@ -473,23 +472,53 @@
         iswin = sys.platform[:3] == 'win'
         if iswin:
             self.text.config(cursor="arrow")
+
+        for label, eventname, verify_state in self.rmenu_specs:
+            if verify_state is None:
+                continue
+            state = getattr(self, verify_state)()
+            rmenu.entryconfigure(label, state=state)
+
+
         rmenu.tk_popup(event.x_root, event.y_root)
         if iswin:
             self.text.config(cursor="ibeam")
 
     rmenu_specs = [
-        # ("Label", "<<virtual-event>>"), ...
-        ("Close", "<<close-window>>"), # Example
+        # ("Label", "<<virtual-event>>", "statefuncname"), ...
+        ("Close", "<<close-window>>", None), # Example
     ]
 
     def make_rmenu(self):
         rmenu = Menu(self.text, tearoff=0)
-        for label, eventname in self.rmenu_specs:
-            def command(text=self.text, eventname=eventname):
-                text.event_generate(eventname)
-            rmenu.add_command(label=label, command=command)
+        for label, eventname, _ in self.rmenu_specs:
+            if label is not None:
+                def command(text=self.text, eventname=eventname):
+                    text.event_generate(eventname)
+                rmenu.add_command(label=label, command=command)
+            else:
+                rmenu.add_separator()
         self.rmenu = rmenu
 
+    def rmenu_check_cut(self):
+        return self.rmenu_check_copy()
+
+    def rmenu_check_copy(self):
+        try:
+            indx = self.text.index('sel.first')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal' if indx else 'disabled'
+
+    def rmenu_check_paste(self):
+        try:
+            self.text.tk.call('tk::GetSelection', self.text, 'CLIPBOARD')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal'
+
     def about_dialog(self, event=None):
         aboutDialog.AboutDialog(self.top,'About IDLE')
 
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -52,7 +52,11 @@
     # Our own right-button menu
 
     rmenu_specs = [
-        ("Go to file/line", "<<goto-file-line>>"),
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Go to file/line", "<<goto-file-line>>", None),
     ]
 
     file_line_pats = [
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -117,8 +117,14 @@
             old_hook()
         self.io.set_filename_change_hook(filename_changed_hook)
 
-    rmenu_specs = [("Set Breakpoint", "<<set-breakpoint-here>>"),
-                   ("Clear Breakpoint", "<<clear-breakpoint-here>>")]
+    rmenu_specs = [
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Set Breakpoint", "<<set-breakpoint-here>>", None),
+        ("Clear Breakpoint", "<<clear-breakpoint-here>>", None)
+    ]
 
     def set_breakpoint(self, lineno):
         text = self.text
@@ -1256,6 +1262,19 @@
                 raise KeyboardInterrupt
         return count
 
+    def rmenu_check_cut(self):
+        try:
+            if self.text.compare('sel.first', '<', 'iomark'):
+                return 'disabled'
+        except TclError: # no selection, so the index 'sel.first' doesn't exist
+            return 'disabled'
+        return super().rmenu_check_cut()
+
+    def rmenu_check_paste(self):
+        if self.text.compare('insert','<','iomark'):
+            return 'disabled'
+        return super().rmenu_check_paste()
+
 class PseudoFile(object):
 
     def __init__(self, shell, tags, encoding=None):
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -120,14 +120,23 @@
 	---
 	(Additional Help Sources may be added here)
 
-Edit context menu (Right-click / Control-click in Edit window):
+Edit context menu (Right-click / Control-click on OS X in Edit window):
 
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
 	Set Breakpoint   -- Sets a breakpoint (when debugger open)
 	Clear Breakpoint -- Clears the breakpoint on that line
 
-Shell context menu (Right-click / Control-click in Shell window):
+Shell context menu (Right-click / Control-click on OS X in Shell window):
 
-	Go to file/line -- Same as in Debug menu
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
+	---
+	Go to file/line  -- Same as in Debug menu
 
 
 ** TIPS **
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@
 Library
 -------
 
+- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
+  Patch by Todd Rovito.
+
 - Issue #16230: Fix a crash in select.select() when one the lists changes
   size while iterated on.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov  1 21:45:03 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  1 Nov 2012 21:45:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=231207589=3A_Add_Cut/Copy/Paste_items_to_ID?=
 =?utf-8?q?LE_right_click_Context_Menu?=
Message-ID: <3Xsz1q5cdWzQsw@mail.python.org>

http://hg.python.org/cpython/rev/e6bf779111a8
changeset:   80175:e6bf779111a8
parent:      80171:56c3ab6f7f07
parent:      80174:3f3b72ab9d65
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 01 22:44:45 2012 +0200
summary:
  Merge issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu

 Patch by Todd Rovito.

files:
  Doc/library/idle.rst        |  21 ++++++++++++
  Lib/idlelib/EditorWindow.py |  43 ++++++++++++++++++++----
  Lib/idlelib/OutputWindow.py |   6 ++-
  Lib/idlelib/PyShell.py      |  23 ++++++++++++-
  Lib/idlelib/help.txt        |  15 ++++++-
  Misc/NEWS                   |   3 +
  6 files changed, 98 insertions(+), 13 deletions(-)


diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -183,6 +183,15 @@
 
 * Right-click in Edit window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Set Breakpoint
    Sets a breakpoint.  Breakpoints are only enabled when the debugger is open.
 
@@ -190,6 +199,9 @@
    Clears the breakpoint on that line.
 
 .. index::
+   single: Cut
+   single: Copy
+   single: Paste
    single: Set Breakpoint
    single: Clear Breakpoint
    single: breakpoints
@@ -200,6 +212,15 @@
 
 * Right-click in Python Shell window (Control-click on OS X)
 
+Cut
+   Copy selection into system-wide clipboard; then delete selection
+
+Copy
+   Copy selection into system-wide clipboard
+
+Paste
+   Insert system-wide clipboard into window
+
 Go to file/line
    Same as in Debug menu.
 
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -464,7 +464,6 @@
     rmenu = None
 
     def right_menu_event(self, event):
-        self.text.tag_remove("sel", "1.0", "end")
         self.text.mark_set("insert", "@%d,%d" % (event.x, event.y))
         if not self.rmenu:
             self.make_rmenu()
@@ -473,23 +472,53 @@
         iswin = sys.platform[:3] == 'win'
         if iswin:
             self.text.config(cursor="arrow")
+
+        for label, eventname, verify_state in self.rmenu_specs:
+            if verify_state is None:
+                continue
+            state = getattr(self, verify_state)()
+            rmenu.entryconfigure(label, state=state)
+
+
         rmenu.tk_popup(event.x_root, event.y_root)
         if iswin:
             self.text.config(cursor="ibeam")
 
     rmenu_specs = [
-        # ("Label", "<<virtual-event>>"), ...
-        ("Close", "<<close-window>>"), # Example
+        # ("Label", "<<virtual-event>>", "statefuncname"), ...
+        ("Close", "<<close-window>>", None), # Example
     ]
 
     def make_rmenu(self):
         rmenu = Menu(self.text, tearoff=0)
-        for label, eventname in self.rmenu_specs:
-            def command(text=self.text, eventname=eventname):
-                text.event_generate(eventname)
-            rmenu.add_command(label=label, command=command)
+        for label, eventname, _ in self.rmenu_specs:
+            if label is not None:
+                def command(text=self.text, eventname=eventname):
+                    text.event_generate(eventname)
+                rmenu.add_command(label=label, command=command)
+            else:
+                rmenu.add_separator()
         self.rmenu = rmenu
 
+    def rmenu_check_cut(self):
+        return self.rmenu_check_copy()
+
+    def rmenu_check_copy(self):
+        try:
+            indx = self.text.index('sel.first')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal' if indx else 'disabled'
+
+    def rmenu_check_paste(self):
+        try:
+            self.text.tk.call('tk::GetSelection', self.text, 'CLIPBOARD')
+        except TclError:
+            return 'disabled'
+        else:
+            return 'normal'
+
     def about_dialog(self, event=None):
         aboutDialog.AboutDialog(self.top,'About IDLE')
 
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -52,7 +52,11 @@
     # Our own right-button menu
 
     rmenu_specs = [
-        ("Go to file/line", "<<goto-file-line>>"),
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Go to file/line", "<<goto-file-line>>", None),
     ]
 
     file_line_pats = [
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -117,8 +117,14 @@
             old_hook()
         self.io.set_filename_change_hook(filename_changed_hook)
 
-    rmenu_specs = [("Set Breakpoint", "<<set-breakpoint-here>>"),
-                   ("Clear Breakpoint", "<<clear-breakpoint-here>>")]
+    rmenu_specs = [
+        ("Cut", "<<cut>>", "rmenu_check_cut"),
+        ("Copy", "<<copy>>", "rmenu_check_copy"),
+        ("Paste", "<<paste>>", "rmenu_check_paste"),
+        (None, None, None),
+        ("Set Breakpoint", "<<set-breakpoint-here>>", None),
+        ("Clear Breakpoint", "<<clear-breakpoint-here>>", None)
+    ]
 
     def set_breakpoint(self, lineno):
         text = self.text
@@ -1259,6 +1265,19 @@
                 raise KeyboardInterrupt
         return count
 
+    def rmenu_check_cut(self):
+        try:
+            if self.text.compare('sel.first', '<', 'iomark'):
+                return 'disabled'
+        except TclError: # no selection, so the index 'sel.first' doesn't exist
+            return 'disabled'
+        return super().rmenu_check_cut()
+
+    def rmenu_check_paste(self):
+        if self.text.compare('insert','<','iomark'):
+            return 'disabled'
+        return super().rmenu_check_paste()
+
 class PseudoFile(object):
 
     def __init__(self, shell, tags, encoding=None):
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -120,14 +120,23 @@
 	---
 	(Additional Help Sources may be added here)
 
-Edit context menu (Right-click / Control-click in Edit window):
+Edit context menu (Right-click / Control-click on OS X in Edit window):
 
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
 	Set Breakpoint   -- Sets a breakpoint (when debugger open)
 	Clear Breakpoint -- Clears the breakpoint on that line
 
-Shell context menu (Right-click / Control-click in Shell window):
+Shell context menu (Right-click / Control-click on OS X in Shell window):
 
-	Go to file/line -- Same as in Debug menu
+	Cut              -- Copy a selection into system-wide clipboard,
+                            then delete the selection
+	Copy             -- Copy selection into system-wide clipboard
+	Paste            -- Insert system-wide clipboard into window
+	---
+	Go to file/line  -- Same as in Debug menu
 
 
 ** TIPS **
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,9 @@
 Library
 -------
 
+- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
+  Patch by Todd Rovito.
+
 - Issue #16230: Fix a crash in select.select() when one the lists changes
   size while iterated on.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Fri Nov  2 02:17:13 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri,  2 Nov 2012 02:17:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Clarify_the_behavior_of_t?=
 =?utf-8?q?he_=22builtin=22_index_directive_entry_type=2E?=
Message-ID: <3Xt53s5GcFzMjH@mail.python.org>

http://hg.python.org/devguide/rev/fbbfd430f9c1
changeset:   562:fbbfd430f9c1
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Thu Nov 01 18:16:30 2012 -0700
summary:
  Clarify the behavior of the "builtin" index directive entry type.

files:
  documenting.rst |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/documenting.rst b/documenting.rst
--- a/documenting.rst
+++ b/documenting.rst
@@ -1339,8 +1339,10 @@
    index entries, which are ``module; search path``, ``search; path, module`` and
    ``path; module search``.
 module, keyword, operator, object, exception, statement, builtin
-   These all create two index entries.  For example, ``module: hashlib`` creates
-   the entries ``module; hashlib`` and ``hashlib; module``.
+   These all create two index entries.  For example, ``module: hashlib``
+   creates the entries ``module; hashlib`` and ``hashlib; module``.  The
+   builtin entry type is slightly different in that "built-in function" is used
+   in place of "builtin" when creating the two entries.
 
 For index directives containing only "single" entries, there is a shorthand
 notation::

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

From solipsis at pitrou.net  Fri Nov  2 05:54:11 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 02 Nov 2012 05:54:11 +0100
Subject: [Python-checkins] Daily reference leaks (e6bf779111a8): sum=0
Message-ID: <E1TU9Gl-0006UI-PL@ap.vmr.nerim.net>

results for e6bf779111a8 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Fri Nov  2 07:33:31 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Nov 2012 07:33:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Grammar_touchu?=
	=?utf-8?q?p=2E?=
Message-ID: <3XtD4q1gMzzPwT@mail.python.org>

http://hg.python.org/cpython/rev/cf62fbf2171a
changeset:   80176:cf62fbf2171a
branch:      3.2
parent:      80173:66643fcf6ee9
user:        Georg Brandl <georg at python.org>
date:        Fri Nov 02 07:34:37 2012 +0100
summary:
  Grammar touchup.

files:
  Doc/extending/embedding.rst |  22 ++++++++++------------
  1 files changed, 10 insertions(+), 12 deletions(-)


diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -66,18 +66,16 @@
      return 0;
    }
 
-Function :c:func:`Py_SetProgramName` should be called before
-:c:func:`Py_Initialize` to inform the interpreter about paths to
-Python run-time libraries.  Next initialize the Python interpreter
-with :c:func:`Py_Initialize`, followed by the execution of a
-hard-coded Python script that prints the date and time.  Afterwards,
-the :c:func:`Py_Finalize` call shuts the interpreter down, followed by
-the end of the program.  In a real program, you may want to get the
-Python script from another source, perhaps a text-editor routine, a
-file, or a database.  Getting the Python code from a file can better
-be done by using the :c:func:`PyRun_SimpleFile` function, which saves
-you the trouble of allocating memory space and loading the file
-contents.
+The :c:func:`Py_SetProgramName` function should be called before
+:c:func:`Py_Initialize` to inform the interpreter about paths to Python run-time
+libraries.  Next, the Python interpreter is initialized with
+:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script
+that prints the date and time.  Afterwards, the :c:func:`Py_Finalize` call shuts
+the interpreter down, followed by the end of the program.  In a real program,
+you may want to get the Python script from another source, perhaps a text-editor
+routine, a file, or a database.  Getting the Python code from a file can better
+be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the
+trouble of allocating memory space and loading the file contents.
 
 
 .. _lower-level-embedding:

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

From python-checkins at python.org  Fri Nov  2 07:33:32 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Nov 2012 07:33:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
	=?utf-8?q?_merge_with_3=2E2?=
Message-ID: <3XtD4r47jrzRDX@mail.python.org>

http://hg.python.org/cpython/rev/e33bc12fcde1
changeset:   80177:e33bc12fcde1
branch:      3.3
parent:      80174:3f3b72ab9d65
parent:      80176:cf62fbf2171a
user:        Georg Brandl <georg at python.org>
date:        Fri Nov 02 07:34:46 2012 +0100
summary:
  merge with 3.2

files:
  Doc/extending/embedding.rst |  22 ++++++++++------------
  1 files changed, 10 insertions(+), 12 deletions(-)


diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -66,18 +66,16 @@
      return 0;
    }
 
-Function :c:func:`Py_SetProgramName` should be called before
-:c:func:`Py_Initialize` to inform the interpreter about paths to
-Python run-time libraries.  Next initialize the Python interpreter
-with :c:func:`Py_Initialize`, followed by the execution of a
-hard-coded Python script that prints the date and time.  Afterwards,
-the :c:func:`Py_Finalize` call shuts the interpreter down, followed by
-the end of the program.  In a real program, you may want to get the
-Python script from another source, perhaps a text-editor routine, a
-file, or a database.  Getting the Python code from a file can better
-be done by using the :c:func:`PyRun_SimpleFile` function, which saves
-you the trouble of allocating memory space and loading the file
-contents.
+The :c:func:`Py_SetProgramName` function should be called before
+:c:func:`Py_Initialize` to inform the interpreter about paths to Python run-time
+libraries.  Next, the Python interpreter is initialized with
+:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script
+that prints the date and time.  Afterwards, the :c:func:`Py_Finalize` call shuts
+the interpreter down, followed by the end of the program.  In a real program,
+you may want to get the Python script from another source, perhaps a text-editor
+routine, a file, or a database.  Getting the Python code from a file can better
+be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the
+trouble of allocating memory space and loading the file contents.
 
 
 .. _lower-level-embedding:

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

From python-checkins at python.org  Fri Nov  2 07:33:33 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Nov 2012 07:33:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_merge_with_3=2E3?=
Message-ID: <3XtD4s6CxRzRCf@mail.python.org>

http://hg.python.org/cpython/rev/58ee0c60d6bf
changeset:   80178:58ee0c60d6bf
parent:      80175:e6bf779111a8
parent:      80177:e33bc12fcde1
user:        Georg Brandl <georg at python.org>
date:        Fri Nov 02 07:34:52 2012 +0100
summary:
  merge with 3.3

files:
  Doc/extending/embedding.rst |  22 ++++++++++------------
  1 files changed, 10 insertions(+), 12 deletions(-)


diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -66,18 +66,16 @@
      return 0;
    }
 
-Function :c:func:`Py_SetProgramName` should be called before
-:c:func:`Py_Initialize` to inform the interpreter about paths to
-Python run-time libraries.  Next initialize the Python interpreter
-with :c:func:`Py_Initialize`, followed by the execution of a
-hard-coded Python script that prints the date and time.  Afterwards,
-the :c:func:`Py_Finalize` call shuts the interpreter down, followed by
-the end of the program.  In a real program, you may want to get the
-Python script from another source, perhaps a text-editor routine, a
-file, or a database.  Getting the Python code from a file can better
-be done by using the :c:func:`PyRun_SimpleFile` function, which saves
-you the trouble of allocating memory space and loading the file
-contents.
+The :c:func:`Py_SetProgramName` function should be called before
+:c:func:`Py_Initialize` to inform the interpreter about paths to Python run-time
+libraries.  Next, the Python interpreter is initialized with
+:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script
+that prints the date and time.  Afterwards, the :c:func:`Py_Finalize` call shuts
+the interpreter down, followed by the end of the program.  In a real program,
+you may want to get the Python script from another source, perhaps a text-editor
+routine, a file, or a database.  Getting the Python code from a file can better
+be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the
+trouble of allocating memory space and loading the file contents.
 
 
 .. _lower-level-embedding:

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

From python-checkins at python.org  Fri Nov  2 07:33:56 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri,  2 Nov 2012 07:33:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Grammar_touchu?=
	=?utf-8?q?p=2E?=
Message-ID: <3XtD5J3GzMzRDg@mail.python.org>

http://hg.python.org/cpython/rev/466cbfb3c0c6
changeset:   80179:466cbfb3c0c6
branch:      2.7
parent:      80172:639dd6e62de4
user:        Georg Brandl <georg at python.org>
date:        Fri Nov 02 07:34:37 2012 +0100
summary:
  Grammar touchup.

files:
  Doc/extending/embedding.rst |  22 ++++++++++------------
  1 files changed, 10 insertions(+), 12 deletions(-)


diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -69,18 +69,16 @@
      return 0;
    }
 
-Function :c:func:`Py_SetProgramName` should be called before
-:c:func:`Py_Initialize` to inform the interpreter about paths to
-Python run-time libraries.  Next initialize the Python interpreter
-with :c:func:`Py_Initialize`, followed by the execution of a
-hard-coded Python script that prints the date and time.  Afterwards,
-the :c:func:`Py_Finalize` call shuts the interpreter down, followed by
-the end of the program.  In a real program, you may want to get the
-Python script from another source, perhaps a text-editor routine, a
-file, or a database.  Getting the Python code from a file can better
-be done by using the :c:func:`PyRun_SimpleFile` function, which saves
-you the trouble of allocating memory space and loading the file
-contents.
+The :c:func:`Py_SetProgramName` function should be called before
+:c:func:`Py_Initialize` to inform the interpreter about paths to Python run-time
+libraries.  Next, the Python interpreter is initialized with
+:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script
+that prints the date and time.  Afterwards, the :c:func:`Py_Finalize` call shuts
+the interpreter down, followed by the end of the program.  In a real program,
+you may want to get the Python script from another source, perhaps a text-editor
+routine, a file, or a database.  Getting the Python code from a file can better
+be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the
+trouble of allocating memory space and loading the file contents.
 
 
 .. _lower-level-embedding:

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

From python-checkins at python.org  Fri Nov  2 15:01:44 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri,  2 Nov 2012 15:01:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTQ1?=
 =?utf-8?q?=3A_Support_legacy_strings_in_the_=5Fcsv_module=2E?=
Message-ID: <3XtQ203lcCzRGd@mail.python.org>

http://hg.python.org/cpython/rev/0b5f00ccf907
changeset:   80180:0b5f00ccf907
branch:      3.3
parent:      80177:e33bc12fcde1
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Nov 02 14:44:20 2012 +0100
summary:
  Issue #16145: Support legacy strings in the _csv module.

files:
  Lib/test/test_csv.py      |  11 +++++++++++
  Modules/_csv.c            |  21 +++++++++++++++------
  Modules/_testcapimodule.c |  24 ++++++++++++++++++++++++
  3 files changed, 50 insertions(+), 6 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
@@ -197,6 +197,17 @@
             fileobj.seek(0)
             self.assertEqual(fileobj.read(), "a,b\r\nc,d\r\n")
 
+    @support.cpython_only
+    def test_writerows_legacy_strings(self):
+        import _testcapi
+
+        c = _testcapi.unicode_legacy_string('a')
+        with TemporaryFile("w+", newline='') as fileobj:
+            writer = csv.writer(fileobj)
+            writer.writerows([[c]])
+            fileobj.seek(0)
+            self.assertEqual(fileobj.read(), "a\r\n")
+
     def _read_test(self, input, expect, **kwargs):
         reader = csv.reader(input, **kwargs)
         result = list(reader)
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -13,8 +13,6 @@
 #include "Python.h"
 #include "structmember.h"
 
-#define IS_BASESTRING(o) \
-    PyUnicode_Check(o)
 
 typedef struct {
     PyObject *error_obj;   /* CSV exception */
@@ -248,6 +246,7 @@
                     name);
                 return -1;
             }
+            /* PyUnicode_READY() is called in PyUnicode_GetLength() */
             if (len > 0)
                 *target = PyUnicode_READ_CHAR(src, 0);
         }
@@ -263,12 +262,14 @@
     else {
         if (src == Py_None)
             *target = NULL;
-        else if (!IS_BASESTRING(src)) {
+        else if (!PyUnicode_Check(src)) {
             PyErr_Format(PyExc_TypeError,
                          "\"%s\" must be a string", name);
             return -1;
         }
         else {
+            if (PyUnicode_READY(src) == -1)
+                return -1;
             Py_XDECREF(*target);
             Py_INCREF(src);
             *target = src;
@@ -357,7 +358,7 @@
         return NULL;
 
     if (dialect != NULL) {
-        if (IS_BASESTRING(dialect)) {
+        if (PyUnicode_Check(dialect)) {
             dialect = get_dialect_from_registry(dialect);
             if (dialect == NULL)
                 return NULL;
@@ -808,6 +809,10 @@
             Py_DECREF(lineobj);
             return NULL;
         }
+        if (PyUnicode_READY(lineobj) == -1) {
+            Py_DECREF(lineobj);
+            return NULL;
+        }
         ++self->line_num;
         kind = PyUnicode_KIND(lineobj);
         data = PyUnicode_DATA(lineobj);
@@ -1108,6 +1113,8 @@
     Py_ssize_t rec_len;
 
     if (field != NULL) {
+        if (PyUnicode_READY(field) == -1)
+            return 0;
         field_kind = PyUnicode_KIND(field);
         field_data = PyUnicode_DATA(field);
         field_len = PyUnicode_GET_LENGTH(field);
@@ -1403,11 +1410,13 @@
 
     if (!PyArg_UnpackTuple(args, "", 1, 2, &name_obj, &dialect_obj))
         return NULL;
-    if (!IS_BASESTRING(name_obj)) {
+    if (!PyUnicode_Check(name_obj)) {
         PyErr_SetString(PyExc_TypeError,
-                        "dialect name must be a string or unicode");
+                        "dialect name must be a string");
         return NULL;
     }
+    if (PyUnicode_READY(name_obj) == -1)
+        return NULL;
     dialect = _call_dialect(dialect_obj, kwargs);
     if (dialect == NULL)
         return NULL;
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1521,6 +1521,29 @@
 }
 
 static PyObject *
+unicode_legacy_string(PyObject *self, PyObject *args)
+{
+    Py_UNICODE *data;
+    Py_ssize_t len;
+    PyObject *u;
+
+    if (!PyArg_ParseTuple(args, "u#", &data, &len))
+        return NULL;
+
+    u = PyUnicode_FromUnicode(NULL, len);
+    if (u == NULL)
+        return NULL;
+
+    memcpy(PyUnicode_AS_UNICODE(u), data, len * sizeof(Py_UNICODE));
+
+    if (len > 0) { /* The empty string is always ready. */
+        assert(!PyUnicode_IS_READY(u));
+    }
+
+    return u;
+}
+
+static PyObject *
 getargs_w_star(PyObject *self, PyObject *args)
 {
     Py_buffer buffer;
@@ -2506,6 +2529,7 @@
     {"unicode_aswidecharstring",unicode_aswidecharstring,        METH_VARARGS},
     {"unicode_encodedecimal",   unicode_encodedecimal,           METH_VARARGS},
     {"unicode_transformdecimaltoascii", unicode_transformdecimaltoascii, METH_VARARGS},
+    {"unicode_legacy_string",   unicode_legacy_string,           METH_VARARGS},
 #ifdef WITH_THREAD
     {"_test_thread_state",      test_thread_state,               METH_VARARGS},
     {"_pending_threadfunc",     pending_threadfunc,              METH_VARARGS},

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

From python-checkins at python.org  Fri Nov  2 15:01:46 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri,  2 Nov 2012 15:01:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XtQ2205TszRJy@mail.python.org>

http://hg.python.org/cpython/rev/f1a25c088b8f
changeset:   80181:f1a25c088b8f
parent:      80178:58ee0c60d6bf
parent:      80180:0b5f00ccf907
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Nov 02 14:49:02 2012 +0100
summary:
  Merge 3.3.

files:
  Lib/test/test_csv.py      |  11 +++++++++++
  Modules/_csv.c            |  21 +++++++++++++++------
  Modules/_testcapimodule.c |  24 ++++++++++++++++++++++++
  3 files changed, 50 insertions(+), 6 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
@@ -197,6 +197,17 @@
             fileobj.seek(0)
             self.assertEqual(fileobj.read(), "a,b\r\nc,d\r\n")
 
+    @support.cpython_only
+    def test_writerows_legacy_strings(self):
+        import _testcapi
+
+        c = _testcapi.unicode_legacy_string('a')
+        with TemporaryFile("w+", newline='') as fileobj:
+            writer = csv.writer(fileobj)
+            writer.writerows([[c]])
+            fileobj.seek(0)
+            self.assertEqual(fileobj.read(), "a\r\n")
+
     def _read_test(self, input, expect, **kwargs):
         reader = csv.reader(input, **kwargs)
         result = list(reader)
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -13,8 +13,6 @@
 #include "Python.h"
 #include "structmember.h"
 
-#define IS_BASESTRING(o) \
-    PyUnicode_Check(o)
 
 typedef struct {
     PyObject *error_obj;   /* CSV exception */
@@ -248,6 +246,7 @@
                     name);
                 return -1;
             }
+            /* PyUnicode_READY() is called in PyUnicode_GetLength() */
             if (len > 0)
                 *target = PyUnicode_READ_CHAR(src, 0);
         }
@@ -263,12 +262,14 @@
     else {
         if (src == Py_None)
             *target = NULL;
-        else if (!IS_BASESTRING(src)) {
+        else if (!PyUnicode_Check(src)) {
             PyErr_Format(PyExc_TypeError,
                          "\"%s\" must be a string", name);
             return -1;
         }
         else {
+            if (PyUnicode_READY(src) == -1)
+                return -1;
             Py_XDECREF(*target);
             Py_INCREF(src);
             *target = src;
@@ -357,7 +358,7 @@
         return NULL;
 
     if (dialect != NULL) {
-        if (IS_BASESTRING(dialect)) {
+        if (PyUnicode_Check(dialect)) {
             dialect = get_dialect_from_registry(dialect);
             if (dialect == NULL)
                 return NULL;
@@ -808,6 +809,10 @@
             Py_DECREF(lineobj);
             return NULL;
         }
+        if (PyUnicode_READY(lineobj) == -1) {
+            Py_DECREF(lineobj);
+            return NULL;
+        }
         ++self->line_num;
         kind = PyUnicode_KIND(lineobj);
         data = PyUnicode_DATA(lineobj);
@@ -1108,6 +1113,8 @@
     Py_ssize_t rec_len;
 
     if (field != NULL) {
+        if (PyUnicode_READY(field) == -1)
+            return 0;
         field_kind = PyUnicode_KIND(field);
         field_data = PyUnicode_DATA(field);
         field_len = PyUnicode_GET_LENGTH(field);
@@ -1403,11 +1410,13 @@
 
     if (!PyArg_UnpackTuple(args, "", 1, 2, &name_obj, &dialect_obj))
         return NULL;
-    if (!IS_BASESTRING(name_obj)) {
+    if (!PyUnicode_Check(name_obj)) {
         PyErr_SetString(PyExc_TypeError,
-                        "dialect name must be a string or unicode");
+                        "dialect name must be a string");
         return NULL;
     }
+    if (PyUnicode_READY(name_obj) == -1)
+        return NULL;
     dialect = _call_dialect(dialect_obj, kwargs);
     if (dialect == NULL)
         return NULL;
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1521,6 +1521,29 @@
 }
 
 static PyObject *
+unicode_legacy_string(PyObject *self, PyObject *args)
+{
+    Py_UNICODE *data;
+    Py_ssize_t len;
+    PyObject *u;
+
+    if (!PyArg_ParseTuple(args, "u#", &data, &len))
+        return NULL;
+
+    u = PyUnicode_FromUnicode(NULL, len);
+    if (u == NULL)
+        return NULL;
+
+    memcpy(PyUnicode_AS_UNICODE(u), data, len * sizeof(Py_UNICODE));
+
+    if (len > 0) { /* The empty string is always ready. */
+        assert(!PyUnicode_IS_READY(u));
+    }
+
+    return u;
+}
+
+static PyObject *
 getargs_w_star(PyObject *self, PyObject *args)
 {
     Py_buffer buffer;
@@ -2506,6 +2529,7 @@
     {"unicode_aswidecharstring",unicode_aswidecharstring,        METH_VARARGS},
     {"unicode_encodedecimal",   unicode_encodedecimal,           METH_VARARGS},
     {"unicode_transformdecimaltoascii", unicode_transformdecimaltoascii, METH_VARARGS},
+    {"unicode_legacy_string",   unicode_legacy_string,           METH_VARARGS},
 #ifdef WITH_THREAD
     {"_test_thread_state",      test_thread_state,               METH_VARARGS},
     {"_pending_threadfunc",     pending_threadfunc,              METH_VARARGS},

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

From python-checkins at python.org  Fri Nov  2 18:07:03 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri,  2 Nov 2012 18:07:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1ODE0?=
 =?utf-8?q?=3A_Use_hash_function_that_is_compatible_with_the_equality?=
Message-ID: <3XtV7q58c6zRMy@mail.python.org>

http://hg.python.org/cpython/rev/969069d464bc
changeset:   80182:969069d464bc
branch:      3.3
parent:      80180:0b5f00ccf907
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Nov 02 17:49:22 2012 +0100
summary:
  Issue #15814: Use hash function that is compatible with the equality
definition from #15573.

files:
  Doc/library/stdtypes.rst |   6 -----
  Lib/test/test_buffer.py  |  32 ++++++++++++++++++++++++++-
  Objects/memoryobject.c   |   8 +++++++
  3 files changed, 38 insertions(+), 8 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2393,12 +2393,6 @@
    .. versionchanged:: 3.3
       One-dimensional memoryviews with formats 'B', 'b' or 'c' are now hashable.
 
-   .. note::
-      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:
 
    .. method:: __eq__(exporter)
diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -3999,14 +3999,42 @@
         m = memoryview(x)
         self.assertEqual(hash(m), hash(x))
 
+        # equality-hash invariant
+        x = ndarray(list(range(12)), shape=[12], format='B')
+        a = memoryview(nd)
+
+        y = ndarray(list(range(12)), shape=[12], format='b')
+        b = memoryview(nd)
+
+        z = ndarray(list(bytes(chr(x), 'latin-1') for x in range(12)),
+                    shape=[12], format='c')
+        c = memoryview(nd)
+
+        if (a == b):
+            self.assertEqual(hash(a), hash(b))
+
+        if (a == c):
+            self.assertEqual(hash(a), hash(c))
+
+        if (b == c):
+            self.assertEqual(hash(b), hash(c))
+
         # non-byte formats
         nd = ndarray(list(range(12)), shape=[2,2,3], format='L')
         m = memoryview(nd)
-        self.assertEqual(hash(m), hash(nd.tobytes()))
+        self.assertRaises(ValueError, m.__hash__)
 
         nd = ndarray(list(range(-6, 6)), shape=[2,2,3], format='h')
         m = memoryview(nd)
-        self.assertEqual(hash(m), hash(nd.tobytes()))
+        self.assertRaises(ValueError, m.__hash__)
+
+        nd = ndarray(list(range(12)), shape=[2,2,3], format='= L')
+        m = memoryview(nd)
+        self.assertRaises(ValueError, m.__hash__)
+
+        nd = ndarray(list(range(-6, 6)), shape=[2,2,3], format='< h')
+        m = memoryview(nd)
+        self.assertRaises(ValueError, m.__hash__)
 
     def test_memoryview_release(self):
 
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2707,6 +2707,8 @@
     if (self->hash == -1) {
         Py_buffer *view = &self->view;
         char *mem = view->buf;
+        Py_ssize_t ret;
+        char fmt;
 
         CHECK_RELEASED_INT(self);
 
@@ -2715,6 +2717,12 @@
                 "cannot hash writable memoryview object");
             return -1;
         }
+        ret = get_native_fmtchar(&fmt, view->format);
+        if (ret < 0 || !IS_BYTE_FORMAT(fmt)) {
+            PyErr_SetString(PyExc_ValueError,
+                "memoryview: hashing is restricted to formats 'B', 'b' or 'c'");
+            return -1;
+        }
         if (view->obj != NULL && PyObject_Hash(view->obj) == -1) {
             /* Keep the original error message */
             return -1;

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

From python-checkins at python.org  Fri Nov  2 18:07:05 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri,  2 Nov 2012 18:07:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XtV7s0PhwzRN6@mail.python.org>

http://hg.python.org/cpython/rev/824cd6d03cb6
changeset:   80183:824cd6d03cb6
parent:      80181:f1a25c088b8f
parent:      80182:969069d464bc
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Nov 02 17:55:11 2012 +0100
summary:
  Merge 3.3.

files:
  Doc/library/stdtypes.rst |   6 -----
  Lib/test/test_buffer.py  |  32 ++++++++++++++++++++++++++-
  Objects/memoryobject.c   |   8 +++++++
  3 files changed, 38 insertions(+), 8 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2393,12 +2393,6 @@
    .. versionchanged:: 3.3
       One-dimensional memoryviews with formats 'B', 'b' or 'c' are now hashable.
 
-   .. note::
-      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:
 
    .. method:: __eq__(exporter)
diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -3999,14 +3999,42 @@
         m = memoryview(x)
         self.assertEqual(hash(m), hash(x))
 
+        # equality-hash invariant
+        x = ndarray(list(range(12)), shape=[12], format='B')
+        a = memoryview(nd)
+
+        y = ndarray(list(range(12)), shape=[12], format='b')
+        b = memoryview(nd)
+
+        z = ndarray(list(bytes(chr(x), 'latin-1') for x in range(12)),
+                    shape=[12], format='c')
+        c = memoryview(nd)
+
+        if (a == b):
+            self.assertEqual(hash(a), hash(b))
+
+        if (a == c):
+            self.assertEqual(hash(a), hash(c))
+
+        if (b == c):
+            self.assertEqual(hash(b), hash(c))
+
         # non-byte formats
         nd = ndarray(list(range(12)), shape=[2,2,3], format='L')
         m = memoryview(nd)
-        self.assertEqual(hash(m), hash(nd.tobytes()))
+        self.assertRaises(ValueError, m.__hash__)
 
         nd = ndarray(list(range(-6, 6)), shape=[2,2,3], format='h')
         m = memoryview(nd)
-        self.assertEqual(hash(m), hash(nd.tobytes()))
+        self.assertRaises(ValueError, m.__hash__)
+
+        nd = ndarray(list(range(12)), shape=[2,2,3], format='= L')
+        m = memoryview(nd)
+        self.assertRaises(ValueError, m.__hash__)
+
+        nd = ndarray(list(range(-6, 6)), shape=[2,2,3], format='< h')
+        m = memoryview(nd)
+        self.assertRaises(ValueError, m.__hash__)
 
     def test_memoryview_release(self):
 
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2707,6 +2707,8 @@
     if (self->hash == -1) {
         Py_buffer *view = &self->view;
         char *mem = view->buf;
+        Py_ssize_t ret;
+        char fmt;
 
         CHECK_RELEASED_INT(self);
 
@@ -2715,6 +2717,12 @@
                 "cannot hash writable memoryview object");
             return -1;
         }
+        ret = get_native_fmtchar(&fmt, view->format);
+        if (ret < 0 || !IS_BYTE_FORMAT(fmt)) {
+            PyErr_SetString(PyExc_ValueError,
+                "memoryview: hashing is restricted to formats 'B', 'b' or 'c'");
+            return -1;
+        }
         if (view->obj != NULL && PyObject_Hash(view->obj) == -1) {
             /* Keep the original error message */
             return -1;

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

From python-checkins at python.org  Fri Nov  2 19:48:59 2012
From: python-checkins at python.org (brett.cannon)
Date: Fri,  2 Nov 2012 19:48:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Block_the_use_of_markup?=
 =?utf-8?q?safe_in_the_Mako_benchmarks_to_keep_them?=
Message-ID: <3XtXPR4r9czRNs@mail.python.org>

http://hg.python.org/benchmarks/rev/a4433106dbf1
changeset:   190:a4433106dbf1
user:        Brett Cannon <brett at python.org>
date:        Fri Nov 02 14:48:53 2012 -0400
summary:
  Block the use of markupsafe in the Mako benchmarks to keep them
consistent in case markupsafe is globally installed.

files:
  performance/bm_mako_v2.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 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,7 +21,8 @@
 from compat import xrange
 import util
 
-# Mako imports
+# Mako imports (w/o markupsafe)
+sys.modules['markupsafe'] = None
 from mako.template import Template
 from mako.lookup import TemplateLookup
 
@@ -29,7 +30,7 @@
 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 
+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
@@ -124,7 +125,7 @@
     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!'

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

From python-checkins at python.org  Fri Nov  2 21:07:38 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Fri,  2 Nov 2012 21:07:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316261=3A_fix_bare?=
	=?utf-8?q?_excepts_in_Doc/?=
Message-ID: <3XtZ8B3xsrzRQ7@mail.python.org>

http://hg.python.org/cpython/rev/b2bd62d1644f
changeset:   80184:b2bd62d1644f
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri Nov 02 22:07:26 2012 +0200
summary:
  Issue #16261: fix bare excepts in Doc/

files:
  Doc/howto/logging-cookbook.rst |  4 +---
  Doc/library/timeit.rst         |  2 +-
  Doc/library/traceback.rst      |  2 +-
  3 files changed, 3 insertions(+), 5 deletions(-)


diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -741,9 +741,7 @@
                     break
                 logger = logging.getLogger(record.name)
                 logger.handle(record) # No level or filter logic applied - just do it!
-            except (KeyboardInterrupt, SystemExit):
-                raise
-            except:
+            except Exception:
                 import sys, traceback
                 print('Whoops! Problem:', file=sys.stderr)
                 traceback.print_exc(file=sys.stderr)
diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -151,7 +151,7 @@
          t = Timer(...)       # outside the try/except
          try:
              t.timeit(...)    # or t.repeat(...)
-         except:
+         except Exception:
              t.print_exc()
 
       The advantage over the standard traceback is that source lines in the
diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -146,7 +146,7 @@
        source = input(">>> ")
        try:
            exec(source, envdir)
-       except:
+       except Exception:
            print("Exception in user code:")
            print("-"*60)
            traceback.print_exc(file=sys.stdout)

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

From solipsis at pitrou.net  Sat Nov  3 05:54:15 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 03 Nov 2012 05:54:15 +0100
Subject: [Python-checkins] Daily reference leaks (b2bd62d1644f): sum=0
Message-ID: <E1TUVkN-0006Rv-JZ@ap.vmr.nerim.net>

results for b2bd62d1644f on branch "default"
--------------------------------------------



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

From ncoghlan at gmail.com  Sat Nov  3 10:38:55 2012
From: ncoghlan at gmail.com (Nick Coghlan)
Date: Sat, 3 Nov 2012 19:38:55 +1000
Subject: [Python-checkins] cpython (3.3): Issue #15814: Use hash
 function that is compatible with the equality
In-Reply-To: <3XtV7q58c6zRMy@mail.python.org>
References: <3XtV7q58c6zRMy@mail.python.org>
Message-ID: <CADiSq7fSaz6uxQeoQeyi0aukH3kLifUAmSpd1ZRJe2KedXD5DQ@mail.gmail.com>

On Sat, Nov 3, 2012 at 3:07 AM, stefan.krah <python-checkins at python.org> wrote:
> +        # equality-hash invariant
> +        x = ndarray(list(range(12)), shape=[12], format='B')
> +        a = memoryview(nd)
> +
> +        y = ndarray(list(range(12)), shape=[12], format='b')
> +        b = memoryview(nd)
> +
> +        z = ndarray(list(bytes(chr(x), 'latin-1') for x in range(12)),
> +                    shape=[12], format='c')
> +        c = memoryview(nd)
> +
> +        if (a == b):
> +            self.assertEqual(hash(a), hash(b))
> +
> +        if (a == c):
> +            self.assertEqual(hash(a), hash(c))
> +
> +        if (b == c):
> +            self.assertEqual(hash(b), hash(c))

These checks could do with a comment explaining why the if statements
are needed (I'm assuming something to do with memory order).

Cheers,
Nick.


-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia

From python-checkins at python.org  Sat Nov  3 11:50:18 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Sat,  3 Nov 2012 11:50:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316218=3A_Fix_brok?=
 =?utf-8?q?en_test_for_supporting_nonascii_characters_in_python?=
Message-ID: <3Xtxkf5MqhzRLB@mail.python.org>

http://hg.python.org/cpython/rev/884c2e93d3f7
changeset:   80185:884c2e93d3f7
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Nov 03 12:50:01 2012 +0200
summary:
  Issue #16218: Fix broken test for supporting nonascii characters in python launcher

files:
  Lib/test/test_cmd_line_script.py |  17 ++++++++++++-----
  1 files changed, 12 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -366,11 +366,18 @@
     def test_non_utf8(self):
         # Issue #16218
         with temp_dir() as script_dir:
-            script_name = _make_test_script(script_dir,
-                    '\udcf1\udcea\udcf0\udce8\udcef\udcf2')
-            self._check_script(script_name, script_name, script_name,
-                               script_dir, None,
-                               importlib.machinery.SourceFileLoader)
+            script_basename = '\udcf1\udcea\udcf0\udce8\udcef\udcf2'
+            source = 'print("test output")\n'
+            script_name = _make_test_script(script_dir, script_basename, source)
+            if not __debug__:
+                run_args = ('-' + 'O' * sys.flags.optimize, script_name)
+            else:
+                run_args = (script_name,)
+            rc, out, _ = assert_python_ok(*run_args)
+            self.assertEqual(0, rc)
+            expected = ("test output" + os.linesep).encode('ascii')
+            self.assertEqual(expected, out)
+
 
 def test_main():
     support.run_unittest(CmdLineTest)

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

From python-checkins at python.org  Sat Nov  3 12:53:08 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Sat,  3 Nov 2012 12:53:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316309=3A_Make_PYT?=
 =?utf-8?q?HONPATH=3D_behavior_the_same_as_if_PYTHONPATH_not_set_at?=
Message-ID: <3Xtz781rcqzMDL@mail.python.org>

http://hg.python.org/cpython/rev/05f8f7544f92
changeset:   80186:05f8f7544f92
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Nov 03 13:52:58 2012 +0200
summary:
  Issue #16309: Make PYTHONPATH= behavior the same as if PYTHONPATH not set at all.

Thanks to Armin Rigo and Alexey Kachayev.

files:
  Lib/test/test_cmd_line.py |  17 +++++++++++++++++
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   3 +++
  Modules/getpath.c         |   4 +---
  4 files changed, 22 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -216,6 +216,23 @@
         self.assertIn(path1.encode('ascii'), out)
         self.assertIn(path2.encode('ascii'), out)
 
+    def test_empty_PYTHONPATH_issue16309(self):
+        """On Posix, it is documented that setting PATH to the
+        empty string is equivalent to not setting PATH at all,
+        which is an exception to the rule that in a string like
+        "/bin::/usr/bin" the empty string in the middle gets
+        interpreted as '.'"""
+        code = """if 1:
+            import sys
+            path = ":".join(sys.path)
+            path = path.encode("ascii", "backslashreplace")
+            sys.stdout.buffer.write(path)"""
+        rc1, out1, err1 = assert_python_ok('-c', code, PYTHONPATH="")
+        rc2, out2, err2 = assert_python_ok('-c', code)
+        # regarding to Posix specification, outputs should be equal
+        # for empty and unset PYTHONPATH
+        self.assertEquals(out1, out2)
+
     def test_displayhook_unencodable(self):
         for encoding in ('ascii', 'latin-1', 'utf-8'):
             env = os.environ.copy()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -587,6 +587,7 @@
 Andreas Jung
 Tattoo Mabonzo K.
 Bohuslav Kabrda
+Alexey Kachayev
 Bob Kahn
 Kurt B. Kaiser
 Tamito Kajiyama
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16309: Make PYTHONPATH="" behavior the same as if PYTHONPATH
+  not set at all.
+
 - Issue #10189: Improve the error reporting of SyntaxErrors related to global
   and nonlocal statements.
 
diff --git a/Modules/getpath.c b/Modules/getpath.c
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -699,13 +699,11 @@
      */
     bufsz = 0;
 
-    if (_rtpypath) {
+    if (_rtpypath && _rtpypath[0] != '\0') {
         size_t rtpypath_len;
         rtpypath = _Py_char2wchar(_rtpypath, &rtpypath_len);
         if (rtpypath != NULL)
             bufsz += rtpypath_len + 1;
-        else
-            _rtpypath = NULL;
     }
 
     defpath = _pythonpath;

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

From python-checkins at python.org  Sat Nov  3 13:37:48 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Sat,  3 Nov 2012 13:37:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316218=3A_skip_tes?=
 =?utf-8?q?t_if_filesystem_doesn=27t_support_required_encoding?=
Message-ID: <3Xv06h2mWtzMCY@mail.python.org>

http://hg.python.org/cpython/rev/95d1adf144ee
changeset:   80187:95d1adf144ee
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Nov 03 14:37:37 2012 +0200
summary:
  Issue #16218: skip test if filesystem doesn't support required encoding

files:
  Lib/test/test_cmd_line_script.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -366,7 +366,12 @@
     def test_non_utf8(self):
         # Issue #16218
         with temp_dir() as script_dir:
-            script_basename = '\udcf1\udcea\udcf0\udce8\udcef\udcf2'
+            script_basename = '\u0441\u043a\u0440\u0438\u043f\u0442'
+            try:
+                script_basename.encode(sys.getfilesystemencoding())
+            except UnicodeEncodeError:
+                raise unittest.SkipTest("Filesystem doesn't support "
+                                        "unicode names")
             source = 'print("test output")\n'
             script_name = _make_test_script(script_dir, script_basename, source)
             if not __debug__:

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

From python-checkins at python.org  Sat Nov  3 14:36:12 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Sat,  3 Nov 2012 14:36:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316284=3A_Prevent_?=
 =?utf-8?q?keeping_unnecessary_references_to_worker_functions_in?=
Message-ID: <3Xv1Q41V1wzR9J@mail.python.org>

http://hg.python.org/cpython/rev/70cef0a160cf
changeset:   80188:70cef0a160cf
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Nov 03 15:36:01 2012 +0200
summary:
  Issue #16284: Prevent keeping unnecessary references to worker functions in concurrent.futures ThreadPoolExecutor.

files:
  Lib/concurrent/futures/process.py   |   4 +++
  Lib/concurrent/futures/thread.py    |   2 +
  Lib/multiprocessing/queues.py       |   4 +++
  Lib/test/test_concurrent_futures.py |  22 +++++++++++++++++
  Misc/ACKS                           |   1 +
  Misc/NEWS                           |   3 ++
  6 files changed, 36 insertions(+), 0 deletions(-)


diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
--- a/Lib/concurrent/futures/process.py
+++ b/Lib/concurrent/futures/process.py
@@ -240,6 +240,8 @@
                         "terminated abruptly while the future was "
                         "running or pending."
                     ))
+                # Delete references to object. See issue16284
+                del work_item
             pending_work_items.clear()
             # Terminate remaining workers forcibly: the queues or their
             # locks may be in a dirty state and block forever.
@@ -264,6 +266,8 @@
                     work_item.future.set_exception(result_item.exception)
                 else:
                     work_item.future.set_result(result_item.result)
+                # Delete references to object. See issue16284
+                del work_item
         # Check whether we should start shutting down.
         executor = executor_reference()
         # No more work items can be added if:
diff --git a/Lib/concurrent/futures/thread.py b/Lib/concurrent/futures/thread.py
--- a/Lib/concurrent/futures/thread.py
+++ b/Lib/concurrent/futures/thread.py
@@ -63,6 +63,8 @@
             work_item = work_queue.get(block=True)
             if work_item is not None:
                 work_item.run()
+                # Delete references to object. See issue16284
+                del work_item
                 continue
             executor = executor_reference()
             # Exit if:
diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -243,10 +243,14 @@
 
                         if wacquire is None:
                             send(obj)
+                            # Delete references to object. See issue16284
+                            del obj
                         else:
                             wacquire()
                             try:
                                 send(obj)
+                                # Delete references to object. See issue16284
+                                del obj
                             finally:
                                 wrelease()
                 except IndexError:
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -15,6 +15,7 @@
 import threading
 import time
 import unittest
+import weakref
 
 from concurrent import futures
 from concurrent.futures._base import (
@@ -52,6 +53,11 @@
     sys.stdout.flush()
 
 
+class MyObject(object):
+    def my_method(self):
+        pass
+
+
 class ExecutorMixin:
     worker_count = 5
 
@@ -396,6 +402,22 @@
         self.executor.map(str, [2] * (self.worker_count + 1))
         self.executor.shutdown()
 
+    @test.support.cpython_only
+    def test_no_stale_references(self):
+        # Issue #16284: check that the executors don't unnecessarily hang onto
+        # references.
+        my_object = MyObject()
+        my_object_collected = threading.Event()
+        my_object_callback = weakref.ref(
+            my_object, lambda obj: my_object_collected.set())
+        # Deliberately discarding the future.
+        self.executor.submit(my_object.my_method)
+        del my_object
+
+        collected = my_object_collected.wait(timeout=5.0)
+        self.assertTrue(collected,
+                        "Stale reference not collected within timeout.")
+
 
 class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest):
     def test_map_submits_without_iteration(self):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -726,6 +726,7 @@
 Loren Luke
 Fredrik Lundh
 Mark Lutz
+Taras Lyapun
 Jim Lynch
 Mikael Lyngvig
 Martin von L?wis
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 Library
 -------
 
+- Issue #16284: Prevent keeping unnecessary references to worker functions
+  in concurrent.futures ThreadPoolExecutor.
+
 - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
   Patch by Todd Rovito.
 

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

From python-checkins at python.org  Sat Nov  3 14:56:23 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Sat,  3 Nov 2012 14:56:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=237317=3A_Display_f?=
 =?utf-8?q?ull_tracebacks_when_an_error_occurs_asynchronously=2E?=
Message-ID: <3Xv1sM36ZczQy5@mail.python.org>

http://hg.python.org/cpython/rev/a281604a5c9a
changeset:   80189:a281604a5c9a
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Nov 03 15:56:05 2012 +0200
summary:
  Issue #7317: Display full tracebacks when an error occurs asynchronously.

  Patch by Alon Horev with update by Alexey Kachayev.

files:
  Lib/test/test_cmd_line.py   |   2 +-
  Lib/test/test_generators.py |  21 ++++++++++-----------
  Misc/NEWS                   |   3 +++
  Python/errors.c             |  15 ++++++++-------
  4 files changed, 22 insertions(+), 19 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -310,7 +310,7 @@
         rc, out, err = assert_python_ok('-c', code)
         self.assertEqual(b'', out)
         self.assertRegex(err.decode('ascii', 'ignore'),
-                         'Exception OSError: .* ignored')
+                         'Exception ignored in.*\nOSError: .*')
 
     def test_closed_stdout(self):
         # Issue #13444: if stdout has been explicitly closed, we should
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1728,9 +1728,7 @@
 >>> g = f()
 >>> next(g)
 >>> del g
->>> sys.stderr.getvalue().startswith(
-...     "Exception RuntimeError: 'generator ignored GeneratorExit' in "
-... )
+>>> "RuntimeError: generator ignored GeneratorExit" in sys.stderr.getvalue()
 True
 >>> sys.stderr = old
 
@@ -1840,22 +1838,23 @@
 ...     sys.stderr = io.StringIO()
 ...     class Leaker:
 ...         def __del__(self):
-...             raise RuntimeError
+...             def invoke(message):
+...                 raise RuntimeError(message)
+...             invoke("test")
 ...
 ...     l = Leaker()
 ...     del l
 ...     err = sys.stderr.getvalue().strip()
-...     err.startswith(
-...         "Exception RuntimeError: RuntimeError() in <"
-...     )
-...     err.endswith("> ignored")
-...     len(err.splitlines())
+...     "Exception ignored in" in err
+...     "RuntimeError: test" in err
+...     "Traceback" in err
+...     "in invoke" in err
 ... finally:
 ...     sys.stderr = old
 True
 True
-1
-
+True
+True
 
 
 These refleak tests should perhaps be in a testfile of their own,
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #7317: Display full tracebacks when an error occurs asynchronously.
+  Patch by Alon Horev with update by Alexey Kachayev.
+
 - Issue #16309: Make PYTHONPATH="" behavior the same as if PYTHONPATH
   not set at all.
 
diff --git a/Python/errors.c b/Python/errors.c
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -798,7 +798,12 @@
     PyErr_Fetch(&t, &v, &tb);
     f = PySys_GetObject("stderr");
     if (f != NULL && f != Py_None) {
-        PyFile_WriteString("Exception ", f);
+        if (obj) {
+            PyFile_WriteString("Exception ignored in: ", f);
+            PyFile_WriteObject(obj, f, 0);
+            PyFile_WriteString("\n", f);
+        }
+        PyTraceBack_Print(tb, f);
         if (t) {
             PyObject* moduleName;
             char* className;
@@ -828,15 +833,11 @@
                 PyFile_WriteString(className, f);
             if (v && v != Py_None) {
                 PyFile_WriteString(": ", f);
-                PyFile_WriteObject(v, f, 0);
+                PyFile_WriteObject(v, f, Py_PRINT_RAW);
             }
+            PyFile_WriteString("\n", f);
             Py_XDECREF(moduleName);
         }
-        if (obj) {
-            PyFile_WriteString(" in ", f);
-            PyFile_WriteObject(obj, f, 0);
-        }
-        PyFile_WriteString(" ignored\n", f);
         PyErr_Clear(); /* Just in case */
     }
     Py_XDECREF(t);

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

From python-checkins at python.org  Sat Nov  3 16:51:39 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 16:51:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MTUyOiBmaXgg?=
 =?utf-8?q?tokenize_to_ignore_whitespace_at_the_end_of_the_code_when_no?=
Message-ID: <3Xv4QM5TnZzR8T@mail.python.org>

http://hg.python.org/cpython/rev/eb7ea51e658e
changeset:   80190:eb7ea51e658e
branch:      2.7
parent:      80179:466cbfb3c0c6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 17:30:51 2012 +0200
summary:
  #16152: fix tokenize to ignore whitespace at the end of the code when no newline is found.  Patch by Ned Batchelder.

files:
  Lib/test/test_tokenize.py |  4 ++++
  Lib/tokenize.py           |  4 +++-
  Misc/ACKS                 |  1 +
  Misc/NEWS                 |  3 +++
  4 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -550,6 +550,10 @@
     NAME       'pass'        (3, 9) (3, 13)
     DEDENT     ''            (4, 0) (4, 0)
     DEDENT     ''            (4, 0) (4, 0)
+
+Pathological whitespace (http://bugs.python.org/issue16152)
+    >>> dump_tokens("@          ")
+    OP         '@'           (1, 0) (1, 1)
 """
 
 
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -95,7 +95,7 @@
                 group("'", r'\\\r?\n'),
                 r'[uUbB]?[rR]?"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
                 group('"', r'\\\r?\n'))
-PseudoExtras = group(r'\\\r?\n', Comment, Triple)
+PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple)
 PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name)
 
 tokenprog, pseudoprog, single3prog, double3prog = map(
@@ -362,6 +362,8 @@
             if pseudomatch:                                # scan for tokens
                 start, end = pseudomatch.span(1)
                 spos, epos, pos = (lnum, start), (lnum, end), end
+                if start == end:
+                    continue
                 token, initial = line[start:end], line[start]
 
                 if initial in numchars or \
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -64,6 +64,7 @@
 Ulf Bartelt
 Don Bashford
 Nick Bastin
+Ned Batchelder
 Jeff Bauer
 Mike Bayer
 Michael R Bax
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@
 Library
 -------
 
+- Issue #16152: fix tokenize to ignore whitespace at the end of the code when
+  no newline is found.  Patch by Ned Batchelder.
+
 - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
   Patch by Todd Rovito.
 

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

From python-checkins at python.org  Sat Nov  3 16:51:41 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 16:51:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MTUyOiBmaXgg?=
 =?utf-8?q?tokenize_to_ignore_whitespace_at_the_end_of_the_code_when_no?=
Message-ID: <3Xv4QP0vsQzR8T@mail.python.org>

http://hg.python.org/cpython/rev/3ffff1798ed5
changeset:   80191:3ffff1798ed5
branch:      3.2
parent:      80176:cf62fbf2171a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 17:38:43 2012 +0200
summary:
  #16152: fix tokenize to ignore whitespace at the end of the code when no newline is found.  Patch by Ned Batchelder.

files:
  Lib/test/test_tokenize.py |  5 +++++
  Lib/tokenize.py           |  4 +++-
  Misc/ACKS                 |  1 +
  Misc/NEWS                 |  3 +++
  4 files changed, 12 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -552,6 +552,11 @@
     DEDENT     ''            (4, 0) (4, 0)
     DEDENT     ''            (4, 0) (4, 0)
 
+Pathological whitespace (http://bugs.python.org/issue16152)
+    >>> dump_tokens("@          ")
+    ENCODING   'utf-8'       (0, 0) (0, 0)
+    OP         '@'           (1, 0) (1, 1)
+
 Non-ascii identifiers
 
     >>> dump_tokens("?rter = 'places'\\ngr?n = 'green'")
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -108,7 +108,7 @@
                 group("'", r'\\\r?\n'),
                 r'[bB]?[rR]?"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
                 group('"', r'\\\r?\n'))
-PseudoExtras = group(r'\\\r?\n', Comment, Triple)
+PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple)
 PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name)
 
 def _compile(expr):
@@ -473,6 +473,8 @@
             if pseudomatch:                                # scan for tokens
                 start, end = pseudomatch.span(1)
                 spos, epos, pos = (lnum, start), (lnum, end), end
+                if start == end:
+                    continue
                 token, initial = line[start:end], line[start]
 
                 if (initial in numchars or                  # ordinary number
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -71,6 +71,7 @@
 Ulf Bartelt
 Don Bashford
 Nick Bastin
+Ned Batchelder
 Jeff Bauer
 Mike Bayer
 Michael R Bax
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #16152: fix tokenize to ignore whitespace at the end of the code when
+  no newline is found.  Patch by Ned Batchelder.
+
 - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
   Patch by Todd Rovito.
 

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

From python-checkins at python.org  Sat Nov  3 16:51:42 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 16:51:42 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316152=3A_merge_with_3=2E2=2E?=
Message-ID: <3Xv4QQ4NprzRD3@mail.python.org>

http://hg.python.org/cpython/rev/1fdeddabddda
changeset:   80192:1fdeddabddda
branch:      3.3
parent:      80182:969069d464bc
parent:      80191:3ffff1798ed5
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 17:46:51 2012 +0200
summary:
  #16152: merge with 3.2.

files:
  Lib/test/test_tokenize.py |  4 ++++
  Lib/tokenize.py           |  4 +++-
  Misc/ACKS                 |  1 +
  Misc/NEWS                 |  3 +++
  4 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1109,6 +1109,10 @@
                                   token.NAME, token.AMPER, token.NUMBER,
                                   token.RPAR)
 
+    def test_pathological_trailing_whitespace(self):
+        # See http://bugs.python.org/issue16152
+        self.assertExactTypeEqual('@          ', token.AT)
+
 __test__ = {"doctests" : doctests, 'decistmt': decistmt}
 
 def test_main():
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -162,7 +162,7 @@
                 group("'", r'\\\r?\n'),
                 StringPrefix + r'"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
                 group('"', r'\\\r?\n'))
-PseudoExtras = group(r'\\\r?\n', Comment, Triple)
+PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple)
 PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name)
 
 def _compile(expr):
@@ -555,6 +555,8 @@
             if pseudomatch:                                # scan for tokens
                 start, end = pseudomatch.span(1)
                 spos, epos, pos = (lnum, start), (lnum, end), end
+                if start == end:
+                    continue
                 token, initial = line[start:end], line[start]
 
                 if (initial in numchars or                  # ordinary number
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -77,6 +77,7 @@
 Don Bashford
 Pior Bastida
 Nick Bastin
+Ned Batchelder
 Jeff Bauer
 Michael R Bax
 Anthony Baxter
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@
 Library
 -------
 
+- Issue #16152: fix tokenize to ignore whitespace at the end of the code when
+  no newline is found.  Patch by Ned Batchelder.
+
 - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
   Patch by Todd Rovito.
 

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

From python-checkins at python.org  Sat Nov  3 16:51:44 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 16:51:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MTUyOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Xv4QS0Mp5zRFt@mail.python.org>

http://hg.python.org/cpython/rev/ed091424f230
changeset:   80193:ed091424f230
parent:      80189:a281604a5c9a
parent:      80192:1fdeddabddda
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 17:51:25 2012 +0200
summary:
  #16152: merge with 3.3.

files:
  Lib/test/test_tokenize.py |  4 ++++
  Lib/tokenize.py           |  4 +++-
  Misc/ACKS                 |  1 +
  Misc/NEWS                 |  3 +++
  4 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1109,6 +1109,10 @@
                                   token.NAME, token.AMPER, token.NUMBER,
                                   token.RPAR)
 
+    def test_pathological_trailing_whitespace(self):
+        # See http://bugs.python.org/issue16152
+        self.assertExactTypeEqual('@          ', token.AT)
+
 __test__ = {"doctests" : doctests, 'decistmt': decistmt}
 
 def test_main():
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -162,7 +162,7 @@
                 group("'", r'\\\r?\n'),
                 StringPrefix + r'"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
                 group('"', r'\\\r?\n'))
-PseudoExtras = group(r'\\\r?\n', Comment, Triple)
+PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple)
 PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name)
 
 def _compile(expr):
@@ -555,6 +555,8 @@
             if pseudomatch:                                # scan for tokens
                 start, end = pseudomatch.span(1)
                 spos, epos, pos = (lnum, start), (lnum, end), end
+                if start == end:
+                    continue
                 token, initial = line[start:end], line[start]
 
                 if (initial in numchars or                  # ordinary number
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -77,6 +77,7 @@
 Don Bashford
 Pior Bastida
 Nick Bastin
+Ned Batchelder
 Jeff Bauer
 Michael R Bax
 Anthony Baxter
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@
 Library
 -------
 
+- Issue #16152: fix tokenize to ignore whitespace at the end of the code when
+  no newline is found.  Patch by Ned Batchelder.
+
 - Issue #16284: Prevent keeping unnecessary references to worker functions
   in concurrent.futures ThreadPoolExecutor.
 

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

From python-checkins at python.org  Sat Nov  3 17:29:44 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 17:29:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Remove_trailin?=
	=?utf-8?q?g_whitespace=2E?=
Message-ID: <3Xv5GJ4ZvYzRKY@mail.python.org>

http://hg.python.org/cpython/rev/d73110888af5
changeset:   80194:d73110888af5
branch:      2.7
parent:      80190:eb7ea51e658e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 18:24:11 2012 +0200
summary:
  Remove trailing whitespace.

files:
  Doc/tools/sphinxext/static/basic.css |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -253,8 +253,8 @@
 
 table.docutils td, table.docutils th {
     padding: 2px 5px 2px 5px;
-    border-left: 0;    
-    background-color: #eef;    
+    border-left: 0;
+    background-color: #eef;
 }
 
 table.docutils td p.last, table.docutils th p.last {
@@ -270,7 +270,7 @@
 }
 
 table.docutils th {
-    border-top: 1px solid #cac;    
+    border-top: 1px solid #cac;
     background-color: #ede;
 }
 
@@ -280,7 +280,7 @@
 }
 
 th.head {
-    text-align: center;    
+    text-align: center;
 }
 
 /* -- other body styles ----------------------------------------------------- */

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

From python-checkins at python.org  Sat Nov  3 17:29:45 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 17:29:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzQ3MTE6IGJyZWFr?=
 =?utf-8?q?_long_words_in_the_docs_sidebar_to_avoid_overflow=2E?=
Message-ID: <3Xv5GK6g2zzRJl@mail.python.org>

http://hg.python.org/cpython/rev/cae65dd22826
changeset:   80195:cae65dd22826
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 18:25:04 2012 +0200
summary:
  #4711: break long words in the docs sidebar to avoid overflow.

files:
  Doc/tools/sphinxext/static/basic.css |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -39,6 +39,7 @@
 
 div.sphinxsidebarwrapper {
     padding: 10px 5px 0 10px;
+    word-wrap: break-word;
 }
 
 div.sphinxsidebar {

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

From python-checkins at python.org  Sat Nov  3 17:29:47 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 17:29:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzQ3MTE6IGJyZWFr?=
 =?utf-8?q?_long_words_in_the_docs_sidebar_to_avoid_overflow=2E?=
Message-ID: <3Xv5GM1h65zRKy@mail.python.org>

http://hg.python.org/cpython/rev/1046110a819d
changeset:   80196:1046110a819d
branch:      3.2
parent:      80191:3ffff1798ed5
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 18:25:04 2012 +0200
summary:
  #4711: break long words in the docs sidebar to avoid overflow.

files:
  Doc/tools/sphinxext/static/basic.css |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -39,6 +39,7 @@
 
 div.sphinxsidebarwrapper {
     padding: 10px 5px 0 10px;
+    word-wrap: break-word;
 }
 
 div.sphinxsidebar {

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

From python-checkins at python.org  Sat Nov  3 17:29:48 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 17:29:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=234711=3A_merge_with_3=2E2=2E?=
Message-ID: <3Xv5GN3kqXzRKl@mail.python.org>

http://hg.python.org/cpython/rev/1bdab9112e59
changeset:   80197:1bdab9112e59
branch:      3.3
parent:      80192:1fdeddabddda
parent:      80196:1046110a819d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 18:29:16 2012 +0200
summary:
  #4711: merge with 3.2.

files:
  Doc/tools/sphinxext/static/basic.css |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -39,6 +39,7 @@
 
 div.sphinxsidebarwrapper {
     padding: 10px 5px 0 10px;
+    word-wrap: break-word;
 }
 
 div.sphinxsidebar {

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

From python-checkins at python.org  Sat Nov  3 17:29:49 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 17:29:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzQ3MTE6IG1lcmdlIHdpdGggMy4zLg==?=
Message-ID: <3Xv5GP5yGzzRJl@mail.python.org>

http://hg.python.org/cpython/rev/c6237edff631
changeset:   80198:c6237edff631
parent:      80193:ed091424f230
parent:      80197:1bdab9112e59
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 18:29:31 2012 +0200
summary:
  #4711: merge with 3.3.

files:
  Doc/tools/sphinxext/static/basic.css |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -39,6 +39,7 @@
 
 div.sphinxsidebarwrapper {
     padding: 10px 5px 0 10px;
+    word-wrap: break-word;
 }
 
 div.sphinxsidebar {

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

From chris.jerdonek at gmail.com  Sat Nov  3 18:36:28 2012
From: chris.jerdonek at gmail.com (Chris Jerdonek)
Date: Sat, 3 Nov 2012 10:36:28 -0700
Subject: [Python-checkins] peps: Revert PEP 430 to Final.
In-Reply-To: <3XqHjw6HZ6zR4V@mail.python.org>
References: <3XqHjw6HZ6zR4V@mail.python.org>
Message-ID: <CAOTb1wf6U_bEBK5oJ2hdBD4+KPd+02t+MZzGs75WNM23ie0hRw@mail.gmail.com>

On Sun, Oct 28, 2012 at 5:07 AM, nick.coghlan
<python-checkins at python.org> wrote:
>
> http://hg.python.org/peps/rev/1ccf682bdfc9
> changeset:   4575:1ccf682bdfc9
> user:        Nick Coghlan <ncoghlan at gmail.com>
> date:        Sun Oct 28 22:06:46 2012 +1000
> summary:
>   Revert PEP 430 to Final.
> ...
> -To help ensure future stability even of links to the in-development version,
> -the ``/dev/`` subpath will be redirected to the appropriate version specific
> -subpath (currently ``/3.4/``).
> ...
>  * ``http://docs.python.org/x/*``
>  * ``http://docs.python.org/x.y/*``
> +* ``http://docs.python.org/dev/*``
>  * ``http://docs.python.org/release/x.y.z/*``
>  * ``http://docs.python.org/devguide``
> ...
> +The ``/dev/`` URL means the documentation for the default branch in source
> +control.

I noticed on an older issue in the tracker that the following deep,
in-development link is broken:

http://docs.python.org/dev/2.6/library/multiprocessing.html

(in comment http://bugs.python.org/issue4711#msg78151 )

Can something be done to preserve those deep links, or is it not worth
worrying about?  I'm not sure how prevalent such links are or when
they were valid (and when they stopped working, assuming they once
did).

--Chris

From python-checkins at python.org  Sat Nov  3 19:34:33 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 19:34:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzEyNzU5OiBzcmVf?=
 =?utf-8?q?parse_now_raises_a_proper_error_when_the_name_of_the_group_is?=
Message-ID: <3Xv82K13b2zRGK@mail.python.org>

http://hg.python.org/cpython/rev/5b5c2c3b2268
changeset:   80199:5b5c2c3b2268
branch:      2.7
parent:      80195:cae65dd22826
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 20:31:12 2012 +0200
summary:
  #12759: sre_parse now raises a proper error when the name of the group is missing.  Initial patch by Serhiy Storchaka.

files:
  Lib/sre_parse.py    |   8 +++++++-
  Lib/test/test_re.py |  20 ++++++++++++++++++++
  Misc/NEWS           |   3 +++
  3 files changed, 30 insertions(+), 1 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -541,6 +541,8 @@
                                 break
                             name = name + char
                         group = 1
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error, "bad character in group name"
                     elif sourcematch("="):
@@ -553,6 +555,8 @@
                             if char == ")":
                                 break
                             name = name + char
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error, "bad character in group name"
                         gid = state.groupdict.get(name)
@@ -605,6 +609,8 @@
                             break
                         condname = condname + char
                     group = 2
+                    if not condname:
+                        raise error("missing group name")
                     if isname(condname):
                         condgroup = state.groupdict.get(condname)
                         if condgroup is None:
@@ -723,7 +729,7 @@
                             break
                         name = name + char
                 if not name:
-                    raise error, "bad group name"
+                    raise error, "missing group name"
                 try:
                     index = int(name)
                     if index < 0:
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -174,11 +174,31 @@
         self.assertEqual(re.sub('x*', '-', 'abxd'), '-a-b-d-')
         self.assertEqual(re.sub('x+', '-', 'abxd'), 'ab-d')
 
+    def test_symbolic_groups(self):
+        re.compile('(?P<a>x)(?P=a)(?(a)y)')
+        re.compile('(?P<a1>x)(?P=a1)(?(a1)y)')
+        self.assertRaises(re.error, re.compile, '(?P<a>)(?P<a>)')
+        self.assertRaises(re.error, re.compile, '(?Px)')
+        self.assertRaises(re.error, re.compile, '(?P=)')
+        self.assertRaises(re.error, re.compile, '(?P=1)')
+        self.assertRaises(re.error, re.compile, '(?P=a)')
+        self.assertRaises(re.error, re.compile, '(?P=a1)')
+        self.assertRaises(re.error, re.compile, '(?P=a.)')
+        self.assertRaises(re.error, re.compile, '(?P<)')
+        self.assertRaises(re.error, re.compile, '(?P<>)')
+        self.assertRaises(re.error, re.compile, '(?P<1>)')
+        self.assertRaises(re.error, re.compile, '(?P<a.>)')
+        self.assertRaises(re.error, re.compile, '(?())')
+        self.assertRaises(re.error, re.compile, '(?(a))')
+        self.assertRaises(re.error, re.compile, '(?(1a))')
+        self.assertRaises(re.error, re.compile, '(?(a.))')
+
     def test_symbolic_refs(self):
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a a>', 'xx')
+        self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<1a1>', 'xx')
         self.assertRaises(IndexError, re.sub, '(?P<a>x)', '\g<ab>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)|(?P<b>y)', '\g<b>', 'xx')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@
 Library
 -------
 
+- Issue #12759: sre_parse now raises a proper error when the name of the group
+  is missing.  Initial patch by Serhiy Storchaka.
+
 - Issue #16152: fix tokenize to ignore whitespace at the end of the code when
   no newline is found.  Patch by Ned Batchelder.
 

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

From python-checkins at python.org  Sat Nov  3 19:34:34 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 19:34:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzEyNzU5OiBzcmVf?=
 =?utf-8?q?parse_now_raises_a_proper_error_when_the_name_of_the_group_is?=
Message-ID: <3Xv82L4Sg3zRJb@mail.python.org>

http://hg.python.org/cpython/rev/29983dd7191e
changeset:   80200:29983dd7191e
branch:      3.2
parent:      80196:1046110a819d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 20:33:08 2012 +0200
summary:
  #12759: sre_parse now raises a proper error when the name of the group is missing.  Initial patch by Serhiy Storchaka.

files:
  Lib/sre_parse.py    |   8 +++++++-
  Lib/test/test_re.py |  20 ++++++++++++++++++++
  Misc/NEWS           |   3 +++
  3 files changed, 30 insertions(+), 1 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -548,6 +548,8 @@
                                 break
                             name = name + char
                         group = 1
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error("bad character in group name")
                     elif sourcematch("="):
@@ -560,6 +562,8 @@
                             if char == ")":
                                 break
                             name = name + char
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error("bad character in group name")
                         gid = state.groupdict.get(name)
@@ -612,6 +616,8 @@
                             break
                         condname = condname + char
                     group = 2
+                    if not condname:
+                        raise error("missing group name")
                     if isname(condname):
                         condgroup = state.groupdict.get(condname)
                         if condgroup is None:
@@ -743,7 +749,7 @@
                             break
                         name = name + char
                 if not name:
-                    raise error("bad group name")
+                    raise error("missing group name")
                 try:
                     index = int(name)
                     if index < 0:
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -161,11 +161,31 @@
         self.assertEqual(re.sub('x*', '-', 'abxd'), '-a-b-d-')
         self.assertEqual(re.sub('x+', '-', 'abxd'), 'ab-d')
 
+    def test_symbolic_groups(self):
+        re.compile('(?P<a>x)(?P=a)(?(a)y)')
+        re.compile('(?P<a1>x)(?P=a1)(?(a1)y)')
+        self.assertRaises(re.error, re.compile, '(?P<a>)(?P<a>)')
+        self.assertRaises(re.error, re.compile, '(?Px)')
+        self.assertRaises(re.error, re.compile, '(?P=)')
+        self.assertRaises(re.error, re.compile, '(?P=1)')
+        self.assertRaises(re.error, re.compile, '(?P=a)')
+        self.assertRaises(re.error, re.compile, '(?P=a1)')
+        self.assertRaises(re.error, re.compile, '(?P=a.)')
+        self.assertRaises(re.error, re.compile, '(?P<)')
+        self.assertRaises(re.error, re.compile, '(?P<>)')
+        self.assertRaises(re.error, re.compile, '(?P<1>)')
+        self.assertRaises(re.error, re.compile, '(?P<a.>)')
+        self.assertRaises(re.error, re.compile, '(?())')
+        self.assertRaises(re.error, re.compile, '(?(a))')
+        self.assertRaises(re.error, re.compile, '(?(1a))')
+        self.assertRaises(re.error, re.compile, '(?(a.))')
+
     def test_symbolic_refs(self):
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a a>', 'xx')
+        self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<1a1>', 'xx')
         self.assertRaises(IndexError, re.sub, '(?P<a>x)', '\g<ab>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)|(?P<b>y)', '\g<b>', 'xx')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #12759: sre_parse now raises a proper error when the name of the group
+  is missing.  Initial patch by Serhiy Storchaka.
+
 - Issue #16152: fix tokenize to ignore whitespace at the end of the code when
   no newline is found.  Patch by Ned Batchelder.
 

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

From python-checkins at python.org  Sat Nov  3 19:34:36 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 19:34:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2312759=3A_merge_with_3=2E2=2E?=
Message-ID: <3Xv82N12V9zRJs@mail.python.org>

http://hg.python.org/cpython/rev/28be586287c8
changeset:   80201:28be586287c8
branch:      3.3
parent:      80197:1bdab9112e59
parent:      80200:29983dd7191e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 20:33:38 2012 +0200
summary:
  #12759: merge with 3.2.

files:
  Lib/sre_parse.py    |   8 +++++++-
  Lib/test/test_re.py |  20 ++++++++++++++++++++
  Misc/NEWS           |   3 +++
  3 files changed, 30 insertions(+), 1 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -580,6 +580,8 @@
                                 break
                             name = name + char
                         group = 1
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error("bad character in group name")
                     elif sourcematch("="):
@@ -592,6 +594,8 @@
                             if char == ")":
                                 break
                             name = name + char
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error("bad character in group name")
                         gid = state.groupdict.get(name)
@@ -644,6 +648,8 @@
                             break
                         condname = condname + char
                     group = 2
+                    if not condname:
+                        raise error("missing group name")
                     if isname(condname):
                         condgroup = state.groupdict.get(condname)
                         if condgroup is None:
@@ -775,7 +781,7 @@
                             break
                         name = name + char
                 if not name:
-                    raise error("bad group name")
+                    raise error("missing group name")
                 try:
                     index = int(name)
                     if index < 0:
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -161,11 +161,31 @@
         self.assertEqual(re.sub('x*', '-', 'abxd'), '-a-b-d-')
         self.assertEqual(re.sub('x+', '-', 'abxd'), 'ab-d')
 
+    def test_symbolic_groups(self):
+        re.compile('(?P<a>x)(?P=a)(?(a)y)')
+        re.compile('(?P<a1>x)(?P=a1)(?(a1)y)')
+        self.assertRaises(re.error, re.compile, '(?P<a>)(?P<a>)')
+        self.assertRaises(re.error, re.compile, '(?Px)')
+        self.assertRaises(re.error, re.compile, '(?P=)')
+        self.assertRaises(re.error, re.compile, '(?P=1)')
+        self.assertRaises(re.error, re.compile, '(?P=a)')
+        self.assertRaises(re.error, re.compile, '(?P=a1)')
+        self.assertRaises(re.error, re.compile, '(?P=a.)')
+        self.assertRaises(re.error, re.compile, '(?P<)')
+        self.assertRaises(re.error, re.compile, '(?P<>)')
+        self.assertRaises(re.error, re.compile, '(?P<1>)')
+        self.assertRaises(re.error, re.compile, '(?P<a.>)')
+        self.assertRaises(re.error, re.compile, '(?())')
+        self.assertRaises(re.error, re.compile, '(?(a))')
+        self.assertRaises(re.error, re.compile, '(?(1a))')
+        self.assertRaises(re.error, re.compile, '(?(a.))')
+
     def test_symbolic_refs(self):
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a a>', 'xx')
+        self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<1a1>', 'xx')
         self.assertRaises(IndexError, re.sub, '(?P<a>x)', '\g<ab>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)|(?P<b>y)', '\g<b>', 'xx')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@
 Library
 -------
 
+- Issue #12759: sre_parse now raises a proper error when the name of the group
+  is missing.  Initial patch by Serhiy Storchaka.
+
 - Issue #16152: fix tokenize to ignore whitespace at the end of the code when
   no newline is found.  Patch by Ned Batchelder.
 

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

From python-checkins at python.org  Sat Nov  3 19:34:37 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 19:34:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzEyNzU5OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Xv82P4MRKzRJq@mail.python.org>

http://hg.python.org/cpython/rev/3f4fbad75c99
changeset:   80202:3f4fbad75c99
parent:      80198:c6237edff631
parent:      80201:28be586287c8
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 20:34:16 2012 +0200
summary:
  #12759: merge with 3.3.

files:
  Lib/sre_parse.py    |   8 +++++++-
  Lib/test/test_re.py |  20 ++++++++++++++++++++
  Misc/NEWS           |   3 +++
  3 files changed, 30 insertions(+), 1 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -580,6 +580,8 @@
                                 break
                             name = name + char
                         group = 1
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error("bad character in group name")
                     elif sourcematch("="):
@@ -592,6 +594,8 @@
                             if char == ")":
                                 break
                             name = name + char
+                        if not name:
+                            raise error("missing group name")
                         if not isname(name):
                             raise error("bad character in group name")
                         gid = state.groupdict.get(name)
@@ -644,6 +648,8 @@
                             break
                         condname = condname + char
                     group = 2
+                    if not condname:
+                        raise error("missing group name")
                     if isname(condname):
                         condgroup = state.groupdict.get(condname)
                         if condgroup is None:
@@ -775,7 +781,7 @@
                             break
                         name = name + char
                 if not name:
-                    raise error("bad group name")
+                    raise error("missing group name")
                 try:
                     index = int(name)
                     if index < 0:
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -161,11 +161,31 @@
         self.assertEqual(re.sub('x*', '-', 'abxd'), '-a-b-d-')
         self.assertEqual(re.sub('x+', '-', 'abxd'), 'ab-d')
 
+    def test_symbolic_groups(self):
+        re.compile('(?P<a>x)(?P=a)(?(a)y)')
+        re.compile('(?P<a1>x)(?P=a1)(?(a1)y)')
+        self.assertRaises(re.error, re.compile, '(?P<a>)(?P<a>)')
+        self.assertRaises(re.error, re.compile, '(?Px)')
+        self.assertRaises(re.error, re.compile, '(?P=)')
+        self.assertRaises(re.error, re.compile, '(?P=1)')
+        self.assertRaises(re.error, re.compile, '(?P=a)')
+        self.assertRaises(re.error, re.compile, '(?P=a1)')
+        self.assertRaises(re.error, re.compile, '(?P=a.)')
+        self.assertRaises(re.error, re.compile, '(?P<)')
+        self.assertRaises(re.error, re.compile, '(?P<>)')
+        self.assertRaises(re.error, re.compile, '(?P<1>)')
+        self.assertRaises(re.error, re.compile, '(?P<a.>)')
+        self.assertRaises(re.error, re.compile, '(?())')
+        self.assertRaises(re.error, re.compile, '(?(a))')
+        self.assertRaises(re.error, re.compile, '(?(1a))')
+        self.assertRaises(re.error, re.compile, '(?(a.))')
+
     def test_symbolic_refs(self):
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<a a>', 'xx')
+        self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<1a1>', 'xx')
         self.assertRaises(IndexError, re.sub, '(?P<a>x)', '\g<ab>', 'xx')
         self.assertRaises(re.error, re.sub, '(?P<a>x)|(?P<b>y)', '\g<b>', 'xx')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@
 Library
 -------
 
+- Issue #12759: sre_parse now raises a proper error when the name of the group
+  is missing.  Initial patch by Serhiy Storchaka.
+
 - Issue #16152: fix tokenize to ignore whitespace at the end of the code when
   no newline is found.  Patch by Ned Batchelder.
 

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

From python-checkins at python.org  Sat Nov  3 20:14:47 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat,  3 Nov 2012 20:14:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Link_to_mappin?=
 =?utf-8?q?g_glossary_entry_in_=22Mapping_Types_-_dict=22_and_os=2Eenviron?=
 =?utf-8?q?_docs=2E?=
Message-ID: <3Xv8wl3GztzRHd@mail.python.org>

http://hg.python.org/cpython/rev/18076647922a
changeset:   80203:18076647922a
branch:      3.2
parent:      80200:29983dd7191e
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sat Nov 03 12:05:55 2012 -0700
summary:
  Link to mapping glossary entry in "Mapping Types - dict" and os.environ docs.

files:
  Doc/library/os.rst       |  4 ++--
  Doc/library/stdtypes.rst |  2 +-
  2 files changed, 3 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
@@ -98,7 +98,7 @@
 
 .. data:: environ
 
-   A mapping object representing the string environment. For example,
+   A :term:`mapping` object representing the string environment. For example,
    ``environ['HOME']`` is the pathname of your home directory (on some platforms),
    and is equivalent to ``getenv("HOME")`` in C.
 
@@ -138,7 +138,7 @@
 
 .. data:: environb
 
-   Bytes version of :data:`environ`: a mapping object representing the
+   Bytes version of :data:`environ`: a :term:`mapping` object representing the
    environment as byte strings. :data:`environ` and :data:`environb` are
    synchronized (modify :data:`environb` updates :data:`environ`, and vice
    versa).
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2095,7 +2095,7 @@
    statement: del
    builtin: len
 
-A :dfn:`mapping` object maps :term:`hashable` values to arbitrary objects.
+A :term:`mapping` object maps :term:`hashable` values to arbitrary objects.
 Mappings are mutable objects.  There is currently only one standard mapping
 type, the :dfn:`dictionary`.  (For other containers see the built in
 :class:`list`, :class:`set`, and :class:`tuple` classes, and the

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

From python-checkins at python.org  Sat Nov  3 20:14:48 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat,  3 Nov 2012 20:14:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_from_3=2E2=3A_link_to_mapping_glossary_entry_in_docs=2E?=
Message-ID: <3Xv8wm5fYYzRHd@mail.python.org>

http://hg.python.org/cpython/rev/5982a6ea124f
changeset:   80204:5982a6ea124f
branch:      3.3
parent:      80201:28be586287c8
parent:      80203:18076647922a
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sat Nov 03 12:06:42 2012 -0700
summary:
  Merge from 3.2: link to mapping glossary entry in docs.

files:
  Doc/library/os.rst       |  4 ++--
  Doc/library/stdtypes.rst |  2 +-
  2 files changed, 3 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
@@ -105,7 +105,7 @@
 
 .. data:: environ
 
-   A mapping object representing the string environment. For example,
+   A :term:`mapping` object representing the string environment. For example,
    ``environ['HOME']`` is the pathname of your home directory (on some platforms),
    and is equivalent to ``getenv("HOME")`` in C.
 
@@ -145,7 +145,7 @@
 
 .. data:: environb
 
-   Bytes version of :data:`environ`: a mapping object representing the
+   Bytes version of :data:`environ`: a :term:`mapping` object representing the
    environment as byte strings. :data:`environ` and :data:`environb` are
    synchronized (modify :data:`environb` updates :data:`environ`, and vice
    versa).
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2928,7 +2928,7 @@
    statement: del
    builtin: len
 
-A :dfn:`mapping` object maps :term:`hashable` values to arbitrary objects.
+A :term:`mapping` object maps :term:`hashable` values to arbitrary objects.
 Mappings are mutable objects.  There is currently only one standard mapping
 type, the :dfn:`dictionary`.  (For other containers see the built-in
 :class:`list`, :class:`set`, and :class:`tuple` classes, and the

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

From python-checkins at python.org  Sat Nov  3 20:14:50 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat,  3 Nov 2012 20:14:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_link_to_mapping_glossary_entry_in_do?=
 =?utf-8?b?Y3Mu?=
Message-ID: <3Xv8wp114zzRJ7@mail.python.org>

http://hg.python.org/cpython/rev/3d467c6e7469
changeset:   80205:3d467c6e7469
parent:      80202:3f4fbad75c99
parent:      80204:5982a6ea124f
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sat Nov 03 12:07:20 2012 -0700
summary:
  Merge from 3.3: link to mapping glossary entry in docs.

files:
  Doc/library/os.rst       |  4 ++--
  Doc/library/stdtypes.rst |  2 +-
  2 files changed, 3 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
@@ -105,7 +105,7 @@
 
 .. data:: environ
 
-   A mapping object representing the string environment. For example,
+   A :term:`mapping` object representing the string environment. For example,
    ``environ['HOME']`` is the pathname of your home directory (on some platforms),
    and is equivalent to ``getenv("HOME")`` in C.
 
@@ -145,7 +145,7 @@
 
 .. data:: environb
 
-   Bytes version of :data:`environ`: a mapping object representing the
+   Bytes version of :data:`environ`: a :term:`mapping` object representing the
    environment as byte strings. :data:`environ` and :data:`environb` are
    synchronized (modify :data:`environb` updates :data:`environ`, and vice
    versa).
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2928,7 +2928,7 @@
    statement: del
    builtin: len
 
-A :dfn:`mapping` object maps :term:`hashable` values to arbitrary objects.
+A :term:`mapping` object maps :term:`hashable` values to arbitrary objects.
 Mappings are mutable objects.  There is currently only one standard mapping
 type, the :dfn:`dictionary`.  (For other containers see the built-in
 :class:`list`, :class:`set`, and :class:`tuple` classes, and the

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

From python-checkins at python.org  Sat Nov  3 20:14:51 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat,  3 Nov 2012 20:14:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?=
 =?utf-8?q?3=2E2=3A_link_to_mapping_glossary_entry_in_docs=2E?=
Message-ID: <3Xv8wq38kWzRJl@mail.python.org>

http://hg.python.org/cpython/rev/781817bbee28
changeset:   80206:781817bbee28
branch:      2.7
parent:      80199:5b5c2c3b2268
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sat Nov 03 12:13:46 2012 -0700
summary:
  Backport from 3.2: link to mapping glossary entry in docs.

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -72,7 +72,7 @@
 
 .. data:: environ
 
-   A mapping object representing the string environment. For example,
+   A :term:`mapping` object representing the string environment. For example,
    ``environ['HOME']`` is the pathname of your home directory (on some platforms),
    and is equivalent to ``getenv("HOME")`` in C.
 
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1937,7 +1937,7 @@
    statement: del
    builtin: len
 
-A :dfn:`mapping` object maps :term:`hashable` values to arbitrary objects.
+A :term:`mapping` object maps :term:`hashable` values to arbitrary objects.
 Mappings are mutable objects.  There is currently only one standard mapping
 type, the :dfn:`dictionary`.  (For other containers see the built in
 :class:`list`, :class:`set`, and :class:`tuple` classes, and the

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

From tjreedy at udel.edu  Sat Nov  3 19:18:17 2012
From: tjreedy at udel.edu (Terry Reedy)
Date: Sat, 03 Nov 2012 14:18:17 -0400
Subject: [Python-checkins] peps: Revert PEP 430 to Final.
In-Reply-To: <CAOTb1wf6U_bEBK5oJ2hdBD4+KPd+02t+MZzGs75WNM23ie0hRw@mail.gmail.com>
References: <3XqHjw6HZ6zR4V@mail.python.org>
	<CAOTb1wf6U_bEBK5oJ2hdBD4+KPd+02t+MZzGs75WNM23ie0hRw@mail.gmail.com>
Message-ID: <50955FE9.3000400@udel.edu>


On 11/3/2012 1:36 PM, Chris Jerdonek wrote:
> On Sun, Oct 28, 2012 at 5:07 AM, nick.coghlan
> <python-checkins at python.org> wrote:
>>
>> http://hg.python.org/peps/rev/1ccf682bdfc9
>> changeset:   4575:1ccf682bdfc9
>> user:        Nick Coghlan <ncoghlan at gmail.com>
>> date:        Sun Oct 28 22:06:46 2012 +1000
>> summary:
>>    Revert PEP 430 to Final.
>> ...
>> -To help ensure future stability even of links to the in-development version,
>> -the ``/dev/`` subpath will be redirected to the appropriate version specific
>> -subpath (currently ``/3.4/``).
>> ...
>>   * ``http://docs.python.org/x/*``
>>   * ``http://docs.python.org/x.y/*``
>> +* ``http://docs.python.org/dev/*``
>>   * ``http://docs.python.org/release/x.y.z/*``
>>   * ``http://docs.python.org/devguide``
>> ...
>> +The ``/dev/`` URL means the documentation for the default branch in source
>> +control.
>
> I noticed on an older issue in the tracker that the following deep,
> in-development link is broken:
>
> http://docs.python.org/dev/2.6/library/multiprocessing.html
>
> (in comment http://bugs.python.org/issue4711#msg78151 )
>
> Can something be done to preserve those deep links, or is it not worth
> worrying about?  I'm not sure how prevalent such links are or when
> they were valid (and when they stopped working, assuming they once
> did).

I'd say not bother. The message was posted 2008-12-11 and the link was 
already obsolete when Ezio answered 2009-07-01, when he gave a permanent 
one. Fortunately, the OP gave a .png screenshot showing the problem.

Any doc link in the tracker becomes obsolete in a sense as soon as the 
problem noted is fixed. So tracker messages should state the problem 
independently of the link. (After the docs are rebuilt tonight,
http://docs.python.org/library/multiprocessing.html
will no longer exhibit the problem either ;-).

--
Terry


From python-checkins at python.org  Sat Nov  3 20:25:04 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:25:04 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzg0MDE6IGFzc2ln?=
 =?utf-8?q?ning_an_int_to_a_bytearray_slice_=28e=2Eg=2E_b=5B3=3A4=5D_=3D_5?=
 =?utf-8?q?=29_now_raises_an?=
Message-ID: <3Xv98c0m3hzPbB@mail.python.org>

http://hg.python.org/cpython/rev/1bd2b272c568
changeset:   80207:1bd2b272c568
branch:      2.7
parent:      80199:5b5c2c3b2268
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:10:45 2012 +0200
summary:
  #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now raises an error.

files:
  Lib/test/test_bytes.py    |  20 ++++++++++++++++++++
  Misc/NEWS                 |   3 +++
  Objects/bytearrayobject.c |   6 ++++++
  3 files changed, 29 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -635,6 +635,26 @@
         b[3:0] = [42, 42, 42]
         self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
 
+        b[3:] = b'foo'
+        self.assertEqual(b, bytearray([0, 1, 2, 102, 111, 111]))
+
+        b[:3] = memoryview(b'foo')
+        self.assertEqual(b, bytearray([102, 111, 111, 102, 111, 111]))
+
+        b[3:4] = []
+        self.assertEqual(b, bytearray([102, 111, 111, 111, 111]))
+
+        b[1:] = list(b'uuuu')  # this works only on Python2
+        self.assertEqual(b, bytearray([102, 117, 117, 117, 117]))
+
+        for elem in [5, -5, 0, long(10e20), u'str', 2.3, [u'a', u'b'], [[]]]:
+            with self.assertRaises(TypeError):
+                b[3:4] = elem
+
+        for elem in [[254, 255, 256], [-256, 9000]]:
+            with self.assertRaises(ValueError):
+                b[3:4] = elem
+
     def test_extended_set_del_slice(self):
         indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
         for start in indices:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
 Core and Builtins
 -----------------
 
+- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
+  raises an error.
+
 - Issue #14700: Fix buggy overflow checks for large width and precision
   in string formatting operations.
 
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -636,6 +636,12 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        if (PyNumber_Check(values) || PyUnicode_Check(values)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "can assign only bytes, buffers, or iterables "
+                            "of ints in range(0, 256)");
+            return -1;
+        }
         /* Make a copy and call this function recursively */
         int err;
         values = PyByteArray_FromObject(values);

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

From python-checkins at python.org  Sat Nov  3 20:25:05 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:25:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
	=?utf-8?q?_Merge_heads=2E?=
Message-ID: <3Xv98d38nqzRGJ@mail.python.org>

http://hg.python.org/cpython/rev/35d85c5c6722
changeset:   80208:35d85c5c6722
branch:      2.7
parent:      80206:781817bbee28
parent:      80207:1bd2b272c568
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:18:57 2012 +0200
summary:
  Merge heads.

files:
  Lib/test/test_bytes.py    |  20 ++++++++++++++++++++
  Misc/NEWS                 |   3 +++
  Objects/bytearrayobject.c |   6 ++++++
  3 files changed, 29 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -635,6 +635,26 @@
         b[3:0] = [42, 42, 42]
         self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
 
+        b[3:] = b'foo'
+        self.assertEqual(b, bytearray([0, 1, 2, 102, 111, 111]))
+
+        b[:3] = memoryview(b'foo')
+        self.assertEqual(b, bytearray([102, 111, 111, 102, 111, 111]))
+
+        b[3:4] = []
+        self.assertEqual(b, bytearray([102, 111, 111, 111, 111]))
+
+        b[1:] = list(b'uuuu')  # this works only on Python2
+        self.assertEqual(b, bytearray([102, 117, 117, 117, 117]))
+
+        for elem in [5, -5, 0, long(10e20), u'str', 2.3, [u'a', u'b'], [[]]]:
+            with self.assertRaises(TypeError):
+                b[3:4] = elem
+
+        for elem in [[254, 255, 256], [-256, 9000]]:
+            with self.assertRaises(ValueError):
+                b[3:4] = elem
+
     def test_extended_set_del_slice(self):
         indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
         for start in indices:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
 Core and Builtins
 -----------------
 
+- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
+  raises an error.
+
 - Issue #14700: Fix buggy overflow checks for large width and precision
   in string formatting operations.
 
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -636,6 +636,12 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        if (PyNumber_Check(values) || PyUnicode_Check(values)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "can assign only bytes, buffers, or iterables "
+                            "of ints in range(0, 256)");
+            return -1;
+        }
         /* Make a copy and call this function recursively */
         int err;
         values = PyByteArray_FromObject(values);

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

From python-checkins at python.org  Sat Nov  3 20:25:06 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:25:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzg0MDE6IGFzc2ln?=
 =?utf-8?q?ning_an_int_to_a_bytearray_slice_=28e=2Eg=2E_b=5B3=3A4=5D_=3D_5?=
 =?utf-8?q?=29_now_raises_an?=
Message-ID: <3Xv98f5xkhzRJ5@mail.python.org>

http://hg.python.org/cpython/rev/8f00af8abaf9
changeset:   80209:8f00af8abaf9
branch:      3.2
parent:      80203:18076647922a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:19:06 2012 +0200
summary:
  #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now raises an error.

files:
  Lib/test/test_bytes.py    |  18 ++++++++++++++++++
  Misc/NEWS                 |   3 +++
  Objects/bytearrayobject.c |   6 ++++++
  3 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -705,6 +705,24 @@
         b[3:0] = [42, 42, 42]
         self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
 
+        b[3:] = b'foo'
+        self.assertEqual(b, bytearray([0, 1, 2, 102, 111, 111]))
+
+        b[:3] = memoryview(b'foo')
+        self.assertEqual(b, bytearray([102, 111, 111, 102, 111, 111]))
+
+        b[3:4] = []
+        self.assertEqual(b, bytearray([102, 111, 111, 111, 111]))
+
+        for elem in [5, -5, 0, int(10e20), 'str', 2.3,
+                     ['a', 'b'], [b'a', b'b'], [[]]]:
+            with self.assertRaises(TypeError):
+                b[3:4] = elem
+
+        for elem in [[254, 255, 256], [-256, 9000]]:
+            with self.assertRaises(ValueError):
+                b[3:4] = elem
+
     def test_extended_set_del_slice(self):
         indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
         for start in indices:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
+  raises an error.
+
 - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass
   received a nonempty dict from the constructor.
 
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,12 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        if (PyNumber_Check(values) || PyUnicode_Check(values)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "can assign only bytes, buffers, or iterables "
+                            "of ints in range(0, 256)");
+            return -1;
+        }
         /* Make a copy and call this function recursively */
         int err;
         values = PyByteArray_FromObject(values);

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

From python-checkins at python.org  Sat Nov  3 20:25:08 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:25:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=238401=3A_merge_with_3=2E2=2E?=
Message-ID: <3Xv98h1Fc1zRJN@mail.python.org>

http://hg.python.org/cpython/rev/06577f6b1c99
changeset:   80210:06577f6b1c99
branch:      3.3
parent:      80204:5982a6ea124f
parent:      80209:8f00af8abaf9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:22:41 2012 +0200
summary:
  #8401: merge with 3.2.

files:
  Lib/test/test_bytes.py    |  18 ++++++++++++++++++
  Misc/NEWS                 |   3 +++
  Objects/bytearrayobject.c |   6 ++++++
  3 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -871,6 +871,24 @@
         b[3:0] = [42, 42, 42]
         self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
 
+        b[3:] = b'foo'
+        self.assertEqual(b, bytearray([0, 1, 2, 102, 111, 111]))
+
+        b[:3] = memoryview(b'foo')
+        self.assertEqual(b, bytearray([102, 111, 111, 102, 111, 111]))
+
+        b[3:4] = []
+        self.assertEqual(b, bytearray([102, 111, 111, 111, 111]))
+
+        for elem in [5, -5, 0, int(10e20), 'str', 2.3,
+                     ['a', 'b'], [b'a', b'b'], [[]]]:
+            with self.assertRaises(TypeError):
+                b[3:4] = elem
+
+        for elem in [[254, 255, 256], [-256, 9000]]:
+            with self.assertRaises(ValueError):
+                b[3:4] = elem
+
     def test_extended_set_del_slice(self):
         indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
         for start in indices:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
+  raises an error.
+
 - Fix segfaults on setting __qualname__ on builtin types and attempting to
   delete it on any type.
 
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,12 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        if (PyNumber_Check(values) || PyUnicode_Check(values)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "can assign only bytes, buffers, or iterables "
+                            "of ints in range(0, 256)");
+            return -1;
+        }
         /* Make a copy and call this function recursively */
         int err;
         values = PyByteArray_FromObject(values);

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

From python-checkins at python.org  Sat Nov  3 20:25:09 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:25:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzg0MDE6IG1lcmdlIHdpdGggMy4zLg==?=
Message-ID: <3Xv98j3XRWzRGJ@mail.python.org>

http://hg.python.org/cpython/rev/db40752c6cc7
changeset:   80211:db40752c6cc7
parent:      80205:3d467c6e7469
parent:      80209:8f00af8abaf9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:24:47 2012 +0200
summary:
  #8401: merge with 3.3.

files:
  Lib/test/test_bytes.py    |  18 ++++++++++++++++++
  Misc/NEWS                 |   3 +++
  Objects/bytearrayobject.c |   6 ++++++
  3 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -885,6 +885,24 @@
         b[3:0] = [42, 42, 42]
         self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
 
+        b[3:] = b'foo'
+        self.assertEqual(b, bytearray([0, 1, 2, 102, 111, 111]))
+
+        b[:3] = memoryview(b'foo')
+        self.assertEqual(b, bytearray([102, 111, 111, 102, 111, 111]))
+
+        b[3:4] = []
+        self.assertEqual(b, bytearray([102, 111, 111, 111, 111]))
+
+        for elem in [5, -5, 0, int(10e20), 'str', 2.3,
+                     ['a', 'b'], [b'a', b'b'], [[]]]:
+            with self.assertRaises(TypeError):
+                b[3:4] = elem
+
+        for elem in [[254, 255, 256], [-256, 9000]]:
+            with self.assertRaises(ValueError):
+                b[3:4] = elem
+
     def test_extended_set_del_slice(self):
         indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
         for start in indices:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
+  raises an error.
+
 - Issue #7317: Display full tracebacks when an error occurs asynchronously.
   Patch by Alon Horev with update by Alexey Kachayev.
 
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,12 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        if (PyNumber_Check(values) || PyUnicode_Check(values)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "can assign only bytes, buffers, or iterables "
+                            "of ints in range(0, 256)");
+            return -1;
+        }
         /* Make a copy and call this function recursively */
         int err;
         values = PyByteArray_FromObject(values);

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

From chris.jerdonek at gmail.com  Sat Nov  3 20:36:36 2012
From: chris.jerdonek at gmail.com (Chris Jerdonek)
Date: Sat, 3 Nov 2012 12:36:36 -0700
Subject: [Python-checkins] peps: Revert PEP 430 to Final.
In-Reply-To: <50955FE9.3000400@udel.edu>
References: <3XqHjw6HZ6zR4V@mail.python.org>
	<CAOTb1wf6U_bEBK5oJ2hdBD4+KPd+02t+MZzGs75WNM23ie0hRw@mail.gmail.com>
	<50955FE9.3000400@udel.edu>
Message-ID: <CAOTb1wdTD6nY5y8CP8EmGPbeimxpPqeFFpbhqOj7uVAEp6iZxg@mail.gmail.com>

On Sat, Nov 3, 2012 at 11:18 AM, Terry Reedy <tjreedy at udel.edu> wrote:
>
> On 11/3/2012 1:36 PM, Chris Jerdonek wrote:
>>
>> I noticed on an older issue in the tracker that the following deep,
>> in-development link is broken:
>>
>> http://docs.python.org/dev/2.6/library/multiprocessing.html
>>
>> (in comment http://bugs.python.org/issue4711#msg78151 )
>>
>> Can something be done to preserve those deep links, or is it not worth
>> worrying about?  I'm not sure how prevalent such links are or when
>> they were valid (and when they stopped working, assuming they once
>> did).
>
>
> I'd say not bother. The message was posted 2008-12-11 and the link was
> already obsolete when Ezio answered 2009-07-01, when he gave a permanent
> one. Fortunately, the OP gave a .png screenshot showing the problem.
>
> Any doc link in the tracker becomes obsolete in a sense as soon as the
> problem noted is fixed. So tracker messages should state the problem
> independently of the link. (After the docs are rebuilt tonight,
> http://docs.python.org/library/multiprocessing.html
> will no longer exhibit the problem either ;-).

Though this link will still exhibit it (which may be what it would redirect to):

http://docs.python.org/2.6/library/multiprocessing.html

So a doc link in the tracker won't become obsolete if we wait long
enough to fix the issue. :)

--Chris

From python-checkins at python.org  Sat Nov  3 20:36:46 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:36:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_a_couple_t?=
	=?utf-8?q?ypos_in_Misc/NEWS=2E?=
Message-ID: <3Xv9Q65gjfzRH9@mail.python.org>

http://hg.python.org/cpython/rev/23b21deef18f
changeset:   80212:23b21deef18f
branch:      2.7
parent:      80208:35d85c5c6722
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:29:08 2012 +0200
summary:
  Fix a couple typos in Misc/NEWS.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,7 +58,7 @@
 
 - Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...).
 
-- Issue #15033: Fix the exit status bug when modules invoked using -m swith,
+- Issue #15033: Fix the exit status bug when modules invoked using -m switch,
   return the proper failure return value (1). Patch contributed by Jeff Knupp.
 
 - Issue #12268: File readline, readlines and read() methods no longer lose
@@ -1349,7 +1349,7 @@
 - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
   by Kasun Herath.
 
-- Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
+- Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
   detect mtime changes by comparing to the system clock instead of to the
   previous value of the mtime.
 
@@ -4923,7 +4923,7 @@
 - Restore Python 2.3 compatibility for decimal.py.
 
 - Issue #1702551: distutils sdist was not excluding VCS directories under
-  Windows. Inital solution by Guy Dalberto.
+  Windows. Initial solution by Guy Dalberto.
 
 - The _tkinter module functions "createfilehandler", "deletefilehandler",
   "createtimerhandler", "mainloop", "dooneevent" and "quit" have been deprecated

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

From python-checkins at python.org  Sat Nov  3 20:36:48 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:36:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_a_couple_t?=
	=?utf-8?q?ypos_in_Misc/NEWS=2E?=
Message-ID: <3Xv9Q80rKvzRJg@mail.python.org>

http://hg.python.org/cpython/rev/62c093909265
changeset:   80213:62c093909265
branch:      3.2
parent:      80209:8f00af8abaf9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:30:32 2012 +0200
summary:
  Fix a couple typos in Misc/NEWS.

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
@@ -72,7 +72,7 @@
 - Issue #15897: zipimport.c doesn't check return value of fseek().
   Patch by Felipe Cruz.
 
-- Issue #15033: Fix the exit status bug when modules invoked using -m swith,
+- Issue #15033: Fix the exit status bug when modules invoked using -m switch,
   return the proper failure return value (1). Patch contributed by Jeff Knupp.
 
 - Issue #12268: File readline, readlines and read() or readall() methods
@@ -700,7 +700,7 @@
 - Issue #15444: Use proper spelling for non-ASCII contributor names.  Patch
   by Serhiy Storchaka.
 
-- Issue 15482: Properly document the default 'level' value for __import__()
+- Issue #15482: Properly document the default 'level' value for __import__()
   while warning about using negative values.
 
 - Issue #15230: Clearly document some of the limitations of the runpy

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

From python-checkins at python.org  Sat Nov  3 20:36:49 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:36:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_typo_fixes_with_3=2E2=2E?=
Message-ID: <3Xv9Q933kRzRJl@mail.python.org>

http://hg.python.org/cpython/rev/e6d0951f412a
changeset:   80214:e6d0951f412a
branch:      3.3
parent:      80210:06577f6b1c99
parent:      80213:62c093909265
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:32:55 2012 +0200
summary:
  Merge typo fixes with 3.2.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -581,14 +581,14 @@
 - Issue #15897: zipimport.c doesn't check return value of fseek().
   Patch by Felipe Cruz.
 
-- Issue #15033: Fix the exit status bug when modules invoked using -m swith,
+- Issue #15033: Fix the exit status bug when modules invoked using -m switch,
   return the proper failure return value (1). Patch contributed by Jeff Knupp.
 
 - Issue #15229: An `OSError` subclass whose __init__ doesn't call back
   OSError.__init__ could produce incomplete instances, leading to crashes when
   calling str() on them.
 
-- Issue 15307: Virtual environments now use symlinks with framework builds on
+- Issue #15307: Virtual environments now use symlinks with framework builds on
   Mac OS X, like other POSIX builds.
 
 Library
@@ -742,7 +742,7 @@
   renamed over the old file when flush() is called on an mbox, MMDF or Babyl
   mailbox.
 
-- Issue 10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for
+- Issue #10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for
   cryptographic purpose.
 
 - Issue #15184: Ensure consistent results of OS X configuration tailoring for

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

From python-checkins at python.org  Sat Nov  3 20:36:50 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 20:36:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_typo_fixes_=28and_the_fix_for_=238401_that_I_wrong?=
 =?utf-8?q?ly_merged=29_with_3=2E3=2E?=
Message-ID: <3Xv9QB5Lh7zRJN@mail.python.org>

http://hg.python.org/cpython/rev/a7ebc0db5c18
changeset:   80215:a7ebc0db5c18
parent:      80211:db40752c6cc7
parent:      80214:e6d0951f412a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 21:36:22 2012 +0200
summary:
  Merge typo fixes (and the fix for #8401 that I wrongly merged) with 3.3.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -673,14 +673,14 @@
 - Issue #15897: zipimport.c doesn't check return value of fseek().
   Patch by Felipe Cruz.
 
-- Issue #15033: Fix the exit status bug when modules invoked using -m swith,
+- Issue #15033: Fix the exit status bug when modules invoked using -m switch,
   return the proper failure return value (1). Patch contributed by Jeff Knupp.
 
 - Issue #15229: An `OSError` subclass whose __init__ doesn't call back
   OSError.__init__ could produce incomplete instances, leading to crashes when
   calling str() on them.
 
-- Issue 15307: Virtual environments now use symlinks with framework builds on
+- Issue #15307: Virtual environments now use symlinks with framework builds on
   Mac OS X, like other POSIX builds.
 
 Library
@@ -834,7 +834,7 @@
   renamed over the old file when flush() is called on an mbox, MMDF or Babyl
   mailbox.
 
-- Issue 10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for
+- Issue #10924: Fixed `crypt.mksalt()` to use a RNG that is suitable for
   cryptographic purpose.
 
 - Issue #15184: Ensure consistent results of OS X configuration tailoring for

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

From python-checkins at python.org  Sat Nov  3 22:05:31 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 22:05:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MzM2OiBmaXgg?=
 =?utf-8?q?input_checking_in_the_surrogatepass_error_handler=2E__Patch_by_?=
 =?utf-8?q?Serhiy?=
Message-ID: <3XvCNW6m4MzPjt@mail.python.org>

http://hg.python.org/cpython/rev/18ed608ee594
changeset:   80216:18ed608ee594
branch:      3.2
parent:      80213:62c093909265
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 23:03:39 2012 +0200
summary:
  #16336: fix input checking in the surrogatepass error handler.  Patch by Serhiy Storchaka.

files:
  Lib/test/test_codecs.py |  2 ++
  Misc/NEWS               |  3 +++
  Python/codecs.c         |  8 ++++----
  3 files changed, 9 insertions(+), 4 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
@@ -647,6 +647,8 @@
         self.assertTrue(codecs.lookup_error("surrogatepass"))
         with self.assertRaises(UnicodeDecodeError):
             b"abc\xed\xa0".decode("utf-8", "surrogatepass")
+        with self.assertRaises(UnicodeDecodeError):
+            b"abc\xed\xa0z".decode("utf-8", "surrogatepass")
 
 class UTF7Test(ReadTest):
     encoding = "utf-7"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16336: fix input checking in the surrogatepass error handler.
+  Patch by Serhiy Storchaka.
+
 - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
   raises an error.
 
diff --git a/Python/codecs.c b/Python/codecs.c
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -821,10 +821,10 @@
         /* Try decoding a single surrogate character. If
            there are more, let the codec call us again. */
         p += start;
-        if (strlen(p) > 2 &&
-            ((p[0] & 0xf0) == 0xe0 ||
-             (p[1] & 0xc0) == 0x80 ||
-             (p[2] & 0xc0) == 0x80)) {
+        if (PyBytes_GET_SIZE(object) - start >= 3 &&
+            (p[0] & 0xf0) == 0xe0 &&
+            (p[1] & 0xc0) == 0x80 &&
+            (p[2] & 0xc0) == 0x80) {
             /* it's a three-byte code */
             ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f);
             if (ch < 0xd800 || ch > 0xdfff)

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

From python-checkins at python.org  Sat Nov  3 22:05:33 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 22:05:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316336=3A_merge_with_3=2E2=2E?=
Message-ID: <3XvCNY2FpWzRC3@mail.python.org>

http://hg.python.org/cpython/rev/8d5c147f030d
changeset:   80217:8d5c147f030d
branch:      3.3
parent:      80214:e6d0951f412a
parent:      80216:18ed608ee594
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 23:04:41 2012 +0200
summary:
  #16336: merge with 3.2.

files:
  Lib/test/test_codecs.py |  2 ++
  Misc/NEWS               |  3 +++
  Python/codecs.c         |  8 ++++----
  3 files changed, 9 insertions(+), 4 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
@@ -668,6 +668,8 @@
         self.assertTrue(codecs.lookup_error("surrogatepass"))
         with self.assertRaises(UnicodeDecodeError):
             b"abc\xed\xa0".decode("utf-8", "surrogatepass")
+        with self.assertRaises(UnicodeDecodeError):
+            b"abc\xed\xa0z".decode("utf-8", "surrogatepass")
 
 @unittest.skipUnless(sys.platform == 'win32',
                      'cp65001 is a Windows-only codec')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16336: fix input checking in the surrogatepass error handler.
+  Patch by Serhiy Storchaka.
+
 - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
   raises an error.
 
diff --git a/Python/codecs.c b/Python/codecs.c
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -791,10 +791,10 @@
         /* Try decoding a single surrogate character. If
            there are more, let the codec call us again. */
         p += start;
-        if (strlen(p) > 2 &&
-            ((p[0] & 0xf0) == 0xe0 ||
-             (p[1] & 0xc0) == 0x80 ||
-             (p[2] & 0xc0) == 0x80)) {
+        if (PyBytes_GET_SIZE(object) - start >= 3 &&
+            (p[0] & 0xf0) == 0xe0 &&
+            (p[1] & 0xc0) == 0x80 &&
+            (p[2] & 0xc0) == 0x80) {
             /* it's a three-byte code */
             ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f);
             if (ch < 0xd800 || ch > 0xdfff)

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

From python-checkins at python.org  Sat Nov  3 22:05:34 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  3 Nov 2012 22:05:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MzM2OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XvCNZ4SGnzRCq@mail.python.org>

http://hg.python.org/cpython/rev/e4aedd239e45
changeset:   80218:e4aedd239e45
parent:      80215:a7ebc0db5c18
parent:      80217:8d5c147f030d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 03 23:05:18 2012 +0200
summary:
  #16336: merge with 3.3.

files:
  Lib/test/test_codecs.py |  2 ++
  Misc/NEWS               |  3 +++
  Python/codecs.c         |  8 ++++----
  3 files changed, 9 insertions(+), 4 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
@@ -668,6 +668,8 @@
         self.assertTrue(codecs.lookup_error("surrogatepass"))
         with self.assertRaises(UnicodeDecodeError):
             b"abc\xed\xa0".decode("utf-8", "surrogatepass")
+        with self.assertRaises(UnicodeDecodeError):
+            b"abc\xed\xa0z".decode("utf-8", "surrogatepass")
 
 @unittest.skipUnless(sys.platform == 'win32',
                      'cp65001 is a Windows-only codec')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16336: fix input checking in the surrogatepass error handler.
+  Patch by Serhiy Storchaka.
+
 - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
   raises an error.
 
diff --git a/Python/codecs.c b/Python/codecs.c
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -791,10 +791,10 @@
         /* Try decoding a single surrogate character. If
            there are more, let the codec call us again. */
         p += start;
-        if (strlen(p) > 2 &&
-            ((p[0] & 0xf0) == 0xe0 ||
-             (p[1] & 0xc0) == 0x80 ||
-             (p[2] & 0xc0) == 0x80)) {
+        if (PyBytes_GET_SIZE(object) - start >= 3 &&
+            (p[0] & 0xf0) == 0xe0 &&
+            (p[1] & 0xc0) == 0x80 &&
+            (p[2] & 0xc0) == 0x80) {
             /* it's a three-byte code */
             ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f);
             if (!Py_UNICODE_IS_SURROGATE(ch))

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

From python-checkins at python.org  Sat Nov  3 22:10:11 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:10:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_examples_f?=
 =?utf-8?q?or_opener_argument_of_open_=28=2313424=29=2E?=
Message-ID: <3XvCTv2Q38zPjt@mail.python.org>

http://hg.python.org/cpython/rev/17b094c08600
changeset:   80219:17b094c08600
branch:      3.3
parent:      80214:e6d0951f412a
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:06:52 2012 -0400
summary:
  Add examples for opener argument of open (#13424).

Patch by Guillaume Pratte.

files:
  Doc/library/functions.rst |  30 +++++++++++++++++++++++++++
  Doc/library/io.rst        |   3 ++
  Misc/ACKS                 |   1 +
  3 files changed, 34 insertions(+), 0 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -935,6 +935,36 @@
    :mod:`os.open` as *opener* results in functionality similar to passing
    ``None``).
 
+   The following example is an alternative implementation for opening files
+   for exclusive writing.  If we did not have support for the ``'x'`` mode,
+   we could implement it with this opener::
+
+      >>> import os
+      >>> def open_exclusive(path, mode):
+      ...     return os.open(path, mode | os.O_CREAT | os.O_EXCL)
+      ...
+      >>> filename = 'spam.txt'
+      >>> fp = open(filename, 'w', opener=open_exclusive)
+      >>> fp2 = open(filename, 'w', opener=open_exclusive)
+      Traceback (most recent call last):
+        ...
+      FileExistsError: [Errno 17] File exists: 'spam.txt'
+
+   This other example uses the :ref:`dir_fd` parameter of the
+   :func:`os.open` function to open a file relative to a given directory::
+
+      >>> import os
+      >>> def open_relative(dirname):
+      ...     dir_fd = os.open(dirname, os.O_RDONLY)
+      ...     def opener(path, flags):
+      ...         return os.open(path, flags, dir_fd=dir_fd)
+      ...     return opener
+      ...
+      >>> opener = open_relative('somedir')
+      >>> with open('spamspam.txt', 'w', opener=opener) as f:
+      ...     print('This will be written to somedir/spamspam.txt', file=f)
+      ...
+
    .. versionchanged:: 3.3
       The *opener* parameter was added.
       The ``'x'`` mode was added.
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -498,6 +498,9 @@
    :mod:`os.open` as *opener* results in functionality similar to passing
    ``None``).
 
+   See the :func:`open` built-in function for examples on using the *opener*
+   parameter.
+
    .. versionchanged:: 3.3
       The *opener* parameter was added.
       The ``'x'`` mode was added.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -929,6 +929,7 @@
 Iustin Pop
 Claudiu Popa
 John Popplewell
+Guillaume Pratte
 Amrit Prem
 Paul Prescod
 Donovan Preston

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

From python-checkins at python.org  Sat Nov  3 22:10:12 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:10:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4z?=
Message-ID: <3XvCTw4jH1zMMp@mail.python.org>

http://hg.python.org/cpython/rev/458bf8dffe83
changeset:   80220:458bf8dffe83
parent:      80215:a7ebc0db5c18
parent:      80219:17b094c08600
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:07:40 2012 -0400
summary:
  Merge 3.3

files:
  Doc/library/functions.rst |  30 +++++++++++++++++++++++++++
  Doc/library/io.rst        |   3 ++
  Misc/ACKS                 |   1 +
  3 files changed, 34 insertions(+), 0 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -935,6 +935,36 @@
    :mod:`os.open` as *opener* results in functionality similar to passing
    ``None``).
 
+   The following example is an alternative implementation for opening files
+   for exclusive writing.  If we did not have support for the ``'x'`` mode,
+   we could implement it with this opener::
+
+      >>> import os
+      >>> def open_exclusive(path, mode):
+      ...     return os.open(path, mode | os.O_CREAT | os.O_EXCL)
+      ...
+      >>> filename = 'spam.txt'
+      >>> fp = open(filename, 'w', opener=open_exclusive)
+      >>> fp2 = open(filename, 'w', opener=open_exclusive)
+      Traceback (most recent call last):
+        ...
+      FileExistsError: [Errno 17] File exists: 'spam.txt'
+
+   This other example uses the :ref:`dir_fd` parameter of the
+   :func:`os.open` function to open a file relative to a given directory::
+
+      >>> import os
+      >>> def open_relative(dirname):
+      ...     dir_fd = os.open(dirname, os.O_RDONLY)
+      ...     def opener(path, flags):
+      ...         return os.open(path, flags, dir_fd=dir_fd)
+      ...     return opener
+      ...
+      >>> opener = open_relative('somedir')
+      >>> with open('spamspam.txt', 'w', opener=opener) as f:
+      ...     print('This will be written to somedir/spamspam.txt', file=f)
+      ...
+
    .. versionchanged:: 3.3
       The *opener* parameter was added.
       The ``'x'`` mode was added.
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -498,6 +498,9 @@
    :mod:`os.open` as *opener* results in functionality similar to passing
    ``None``).
 
+   See the :func:`open` built-in function for examples on using the *opener*
+   parameter.
+
    .. versionchanged:: 3.3
       The *opener* parameter was added.
       The ``'x'`` mode was added.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -931,6 +931,7 @@
 Iustin Pop
 Claudiu Popa
 John Popplewell
+Guillaume Pratte
 Amrit Prem
 Paul Prescod
 Donovan Preston

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

From python-checkins at python.org  Sat Nov  3 22:10:14 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:10:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_Branch_merge?=
Message-ID: <3XvCTy078mzRD3@mail.python.org>

http://hg.python.org/cpython/rev/dc3791b502ea
changeset:   80221:dc3791b502ea
branch:      3.3
parent:      80219:17b094c08600
parent:      80217:8d5c147f030d
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:09:22 2012 -0400
summary:
  Branch merge

files:
  Lib/test/test_codecs.py |  2 ++
  Misc/NEWS               |  3 +++
  Python/codecs.c         |  8 ++++----
  3 files changed, 9 insertions(+), 4 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
@@ -668,6 +668,8 @@
         self.assertTrue(codecs.lookup_error("surrogatepass"))
         with self.assertRaises(UnicodeDecodeError):
             b"abc\xed\xa0".decode("utf-8", "surrogatepass")
+        with self.assertRaises(UnicodeDecodeError):
+            b"abc\xed\xa0z".decode("utf-8", "surrogatepass")
 
 @unittest.skipUnless(sys.platform == 'win32',
                      'cp65001 is a Windows-only codec')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16336: fix input checking in the surrogatepass error handler.
+  Patch by Serhiy Storchaka.
+
 - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
   raises an error.
 
diff --git a/Python/codecs.c b/Python/codecs.c
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -791,10 +791,10 @@
         /* Try decoding a single surrogate character. If
            there are more, let the codec call us again. */
         p += start;
-        if (strlen(p) > 2 &&
-            ((p[0] & 0xf0) == 0xe0 ||
-             (p[1] & 0xc0) == 0x80 ||
-             (p[2] & 0xc0) == 0x80)) {
+        if (PyBytes_GET_SIZE(object) - start >= 3 &&
+            (p[0] & 0xf0) == 0xe0 &&
+            (p[1] & 0xc0) == 0x80 &&
+            (p[2] & 0xc0) == 0x80) {
             /* it's a three-byte code */
             ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f);
             if (ch < 0xd800 || ch > 0xdfff)

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

From python-checkins at python.org  Sat Nov  3 22:10:15 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:10:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_Branch_merge?=
Message-ID: <3XvCTz2T2gzRCQ@mail.python.org>

http://hg.python.org/cpython/rev/2a58d406e5c5
changeset:   80222:2a58d406e5c5
parent:      80220:458bf8dffe83
parent:      80218:e4aedd239e45
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:09:37 2012 -0400
summary:
  Branch merge

files:
  Lib/test/test_codecs.py |  2 ++
  Misc/NEWS               |  3 +++
  Python/codecs.c         |  8 ++++----
  3 files changed, 9 insertions(+), 4 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
@@ -668,6 +668,8 @@
         self.assertTrue(codecs.lookup_error("surrogatepass"))
         with self.assertRaises(UnicodeDecodeError):
             b"abc\xed\xa0".decode("utf-8", "surrogatepass")
+        with self.assertRaises(UnicodeDecodeError):
+            b"abc\xed\xa0z".decode("utf-8", "surrogatepass")
 
 @unittest.skipUnless(sys.platform == 'win32',
                      'cp65001 is a Windows-only codec')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16336: fix input checking in the surrogatepass error handler.
+  Patch by Serhiy Storchaka.
+
 - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
   raises an error.
 
diff --git a/Python/codecs.c b/Python/codecs.c
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -791,10 +791,10 @@
         /* Try decoding a single surrogate character. If
            there are more, let the codec call us again. */
         p += start;
-        if (strlen(p) > 2 &&
-            ((p[0] & 0xf0) == 0xe0 ||
-             (p[1] & 0xc0) == 0x80 ||
-             (p[2] & 0xc0) == 0x80)) {
+        if (PyBytes_GET_SIZE(object) - start >= 3 &&
+            (p[0] & 0xf0) == 0xe0 &&
+            (p[1] & 0xc0) == 0x80 &&
+            (p[2] & 0xc0) == 0x80) {
             /* it's a three-byte code */
             ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f);
             if (!Py_UNICODE_IS_SURROGATE(ch))

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

From python-checkins at python.org  Sat Nov  3 22:10:16 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:10:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Branch_merge?=
Message-ID: <3XvCV04VGDzRFs@mail.python.org>

http://hg.python.org/cpython/rev/e3f01a6604c8
changeset:   80223:e3f01a6604c8
parent:      80222:2a58d406e5c5
parent:      80221:dc3791b502ea
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:10:01 2012 -0400
summary:
  Branch merge

files:



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

From python-checkins at python.org  Sat Nov  3 22:40:18 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:40:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Avoid_fd_leak_?=
 =?utf-8?q?in_example=2E__Caught_by_Serhiy=2E?=
Message-ID: <3XvD8f3mRzzMXy@mail.python.org>

http://hg.python.org/cpython/rev/95ea024f0569
changeset:   80224:95ea024f0569
branch:      3.3
parent:      80221:dc3791b502ea
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:39:45 2012 -0400
summary:
  Avoid fd leak in example.  Caught by Serhiy.

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -958,12 +958,13 @@
       ...     dir_fd = os.open(dirname, os.O_RDONLY)
       ...     def opener(path, flags):
       ...         return os.open(path, flags, dir_fd=dir_fd)
-      ...     return opener
+      ...     return opener, dir_fd
       ...
-      >>> opener = open_relative('somedir')
+      >>> opener, dir_fd = open_relative('somedir')
       >>> with open('spamspam.txt', 'w', opener=opener) as f:
       ...     print('This will be written to somedir/spamspam.txt', file=f)
       ...
+      >>> os.close(dir_fd)  # don't leak a file descriptor
 
    .. versionchanged:: 3.3
       The *opener* parameter was added.

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

From python-checkins at python.org  Sat Nov  3 22:40:19 2012
From: python-checkins at python.org (eric.araujo)
Date: Sat,  3 Nov 2012 22:40:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4z?=
Message-ID: <3XvD8g6JTmzRFs@mail.python.org>

http://hg.python.org/cpython/rev/bc8e6301cfc2
changeset:   80225:bc8e6301cfc2
parent:      80223:e3f01a6604c8
parent:      80224:95ea024f0569
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Nov 03 17:40:06 2012 -0400
summary:
  Merge 3.3

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -958,12 +958,13 @@
       ...     dir_fd = os.open(dirname, os.O_RDONLY)
       ...     def opener(path, flags):
       ...         return os.open(path, flags, dir_fd=dir_fd)
-      ...     return opener
+      ...     return opener, dir_fd
       ...
-      >>> opener = open_relative('somedir')
+      >>> opener, dir_fd = open_relative('somedir')
       >>> with open('spamspam.txt', 'w', opener=opener) as f:
       ...     print('This will be written to somedir/spamspam.txt', file=f)
       ...
+      >>> os.close(dir_fd)  # don't leak a file descriptor
 
    .. versionchanged:: 3.3
       The *opener* parameter was added.

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

From python-checkins at python.org  Sat Nov  3 23:09:23 2012
From: python-checkins at python.org (christian.heimes)
Date: Sat,  3 Nov 2012 23:09:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_compilatio?=
	=?utf-8?q?n_on_Windows?=
Message-ID: <3XvDpC3qWwzN9l@mail.python.org>

http://hg.python.org/cpython/rev/d8c47e199297
changeset:   80226:d8c47e199297
branch:      3.2
parent:      80216:18ed608ee594
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Nov 03 23:07:59 2012 +0100
summary:
  Fix compilation on Windows

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


diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,7 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        int err;
         if (PyNumber_Check(values) || PyUnicode_Check(values)) {
             PyErr_SetString(PyExc_TypeError,
                             "can assign only bytes, buffers, or iterables "
@@ -596,7 +597,6 @@
             return -1;
         }
         /* Make a copy and call this function recursively */
-        int err;
         values = PyByteArray_FromObject(values);
         if (values == NULL)
             return -1;

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

From python-checkins at python.org  Sat Nov  3 23:09:24 2012
From: python-checkins at python.org (christian.heimes)
Date: Sat,  3 Nov 2012 23:09:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Fix_compilation_on_Windows?=
Message-ID: <3XvDpD62TbzN9l@mail.python.org>

http://hg.python.org/cpython/rev/c69f9dcae45b
changeset:   80227:c69f9dcae45b
branch:      3.3
parent:      80224:95ea024f0569
parent:      80226:d8c47e199297
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Nov 03 23:08:18 2012 +0100
summary:
  Fix compilation on Windows

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


diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,7 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        int err;
         if (PyNumber_Check(values) || PyUnicode_Check(values)) {
             PyErr_SetString(PyExc_TypeError,
                             "can assign only bytes, buffers, or iterables "
@@ -596,7 +597,6 @@
             return -1;
         }
         /* Make a copy and call this function recursively */
-        int err;
         values = PyByteArray_FromObject(values);
         if (values == NULL)
             return -1;

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

From python-checkins at python.org  Sat Nov  3 23:09:26 2012
From: python-checkins at python.org (christian.heimes)
Date: Sat,  3 Nov 2012 23:09:26 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fix_compilation_on_Windows?=
Message-ID: <3XvDpG1J4ZzP3k@mail.python.org>

http://hg.python.org/cpython/rev/23e2682a2096
changeset:   80228:23e2682a2096
parent:      80225:bc8e6301cfc2
parent:      80227:c69f9dcae45b
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Nov 03 23:08:27 2012 +0100
summary:
  Fix compilation on Windows

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


diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,7 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        int err;
         if (PyNumber_Check(values) || PyUnicode_Check(values)) {
             PyErr_SetString(PyExc_TypeError,
                             "can assign only bytes, buffers, or iterables "
@@ -596,7 +597,6 @@
             return -1;
         }
         /* Make a copy and call this function recursively */
-        int err;
         values = PyByteArray_FromObject(values);
         if (values == NULL)
             return -1;

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

From python-checkins at python.org  Sat Nov  3 23:09:27 2012
From: python-checkins at python.org (christian.heimes)
Date: Sat,  3 Nov 2012 23:09:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_compilatio?=
	=?utf-8?q?n_on_Windows?=
Message-ID: <3XvDpH3P4lzPxC@mail.python.org>

http://hg.python.org/cpython/rev/6c639a1ff53d
changeset:   80229:6c639a1ff53d
branch:      2.7
parent:      80212:23b21deef18f
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Nov 03 23:07:59 2012 +0100
summary:
  Fix compilation on Windows

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


diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -636,6 +636,7 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        int err;
         if (PyNumber_Check(values) || PyUnicode_Check(values)) {
             PyErr_SetString(PyExc_TypeError,
                             "can assign only bytes, buffers, or iterables "
@@ -643,7 +644,6 @@
             return -1;
         }
         /* Make a copy and call this function recursively */
-        int err;
         values = PyByteArray_FromObject(values);
         if (values == NULL)
             return -1;

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

From python-checkins at python.org  Sun Nov  4 02:11:07 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun,  4 Nov 2012 02:11:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315837=3A_add_some?=
 =?utf-8?q?_tests_for_random=2Eshuffle=28=29=2E?=
Message-ID: <3XvJqv654PzR7S@mail.python.org>

http://hg.python.org/cpython/rev/58776cc74e89
changeset:   80230:58776cc74e89
parent:      80228:23e2682a2096
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 04 02:10:33 2012 +0100
summary:
  Issue #15837: add some tests for random.shuffle().
Patch by Alessandro Moura.

files:
  Lib/random.py           |   7 +++--
  Lib/test/test_random.py |  33 +++++++++++++++++++++++++++++
  2 files changed, 37 insertions(+), 3 deletions(-)


diff --git a/Lib/random.py b/Lib/random.py
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -252,10 +252,11 @@
         return seq[i]
 
     def shuffle(self, x, random=None, int=int):
-        """x, random=random.random -> shuffle list x in place; return None.
+        """Shuffle list x in place, and return None.
 
-        Optional arg random is a 0-argument function returning a random
-        float in [0.0, 1.0); by default, the standard random.random.
+        Optional argument random is a 0-argument function returning a
+        random float in [0.0, 1.0); if it is the default None, the
+        standard random.random will be used.
         """
 
         randbelow = self._randbelow
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -46,6 +46,39 @@
         self.assertRaises(TypeError, self.gen.seed, 1, 2, 3, 4)
         self.assertRaises(TypeError, type(self.gen), [])
 
+    def test_shuffle(self):
+        shuffle = self.gen.shuffle
+        lst = []
+        shuffle(lst)
+        self.assertEqual(lst, [])
+        lst = [37]
+        shuffle(lst)
+        self.assertEqual(lst, [37])
+        seqs = [list(range(n)) for n in range(10)]
+        shuffled_seqs = [list(range(n)) for n in range(10)]
+        for shuffled_seq in shuffled_seqs:
+            shuffle(shuffled_seq)
+        for (seq, shuffled_seq) in zip(seqs, shuffled_seqs):
+            self.assertEqual(len(seq), len(shuffled_seq))
+            self.assertEqual(set(seq), set(shuffled_seq))
+
+        # The above tests all would pass if the shuffle was a
+        # no-op. The following non-deterministic test covers that.  It
+        # asserts that the shuffled sequence of 1000 distinct elements
+        # must be different from the original one. Although there is
+        # mathematically a non-zero probability that this could
+        # actually happen in a genuinely random shuffle, it is
+        # completely negligible, given that the number of possible
+        # permutations of 1000 objects is 1000! (factorial of 1000),
+        # which is considerably larger than the number of atoms in the
+        # universe...
+        lst = list(range(1000))
+        shuffled_lst = list(range(1000))
+        shuffle(shuffled_lst)
+        self.assertTrue(lst != shuffled_lst)
+        shuffle(lst)
+        self.assertTrue(lst != shuffled_lst)
+
     def test_choice(self):
         choice = self.gen.choice
         with self.assertRaises(IndexError):

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

From python-checkins at python.org  Sun Nov  4 02:33:45 2012
From: python-checkins at python.org (jesus.cea)
Date: Sun,  4 Nov 2012 02:33:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNjE4?=
 =?utf-8?q?3=3A_ZipExtFile_object_close_without_file_handle_closed_=28back?=
 =?utf-8?q?porting?=
Message-ID: <3XvKL11f3bzR9h@mail.python.org>

http://hg.python.org/cpython/rev/6a14f692df1c
changeset:   80231:6a14f692df1c
branch:      2.7
parent:      80229:6c639a1ff53d
user:        Jesus Cea <jcea at jcea.es>
date:        Sun Nov 04 02:32:08 2012 +0100
summary:
  Closes #16183: ZipExtFile object close without file handle closed (backporting of Issue #9846)

files:
  Lib/zipfile.py |  15 +++++++++++++--
  1 files changed, 13 insertions(+), 2 deletions(-)


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -475,9 +475,11 @@
     # Search for universal newlines or line chunks.
     PATTERN = re.compile(r'^(?P<chunk>[^\r\n]+)|(?P<newline>\n|\r\n?)')
 
-    def __init__(self, fileobj, mode, zipinfo, decrypter=None):
+    def __init__(self, fileobj, mode, zipinfo, decrypter=None,
+            close_fileobj=False):
         self._fileobj = fileobj
         self._decrypter = decrypter
+        self._close_fileobj = close_fileobj
 
         self._compress_type = zipinfo.compress_type
         self._compress_size = zipinfo.compress_size
@@ -649,6 +651,12 @@
         self._offset += len(data)
         return data
 
+    def close(self):
+        try :
+            if self._close_fileobj:
+                self._fileobj.close()
+        finally:
+            super(ZipExtFile, self).close()
 
 
 class ZipFile(object):
@@ -896,8 +904,10 @@
         # given a file object in the constructor
         if self._filePassed:
             zef_file = self.fp
+            should_close = False
         else:
             zef_file = open(self.filename, 'rb')
+            should_close = True
 
         # Make sure we have an info object
         if isinstance(name, ZipInfo):
@@ -951,7 +961,8 @@
             if ord(h[11]) != check_byte:
                 raise RuntimeError("Bad password for file", name)
 
-        return  ZipExtFile(zef_file, mode, zinfo, zd)
+        return  ZipExtFile(zef_file, mode, zinfo, zd,
+                close_fileobj=should_close)
 
     def extract(self, member, path=None, pwd=None):
         """Extract a member from the archive to the current working directory,

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

From solipsis at pitrou.net  Sun Nov  4 05:54:56 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 04 Nov 2012 05:54:56 +0100
Subject: [Python-checkins] Daily reference leaks (58776cc74e89): sum=1
Message-ID: <E1TUsEa-0006Rb-QI@ap.vmr.nerim.net>

results for 58776cc74e89 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/reflogQcTjlw', '-x']

From python-checkins at python.org  Sun Nov  4 06:00:19 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 06:00:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzA0OiBjbGFy?=
 =?utf-8?q?ify_match_objects_docs=2E__Initial_patch_by_Jan_Duzinkiewicz=2E?=
Message-ID: <3XvPwM214szR7r@mail.python.org>

http://hg.python.org/cpython/rev/dc96df8556d8
changeset:   80232:dc96df8556d8
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 04 06:46:28 2012 +0200
summary:
  #16304: clarify match objects docs.  Initial patch by Jan Duzinkiewicz.

files:
  Doc/library/re.rst |  13 ++++++++++---
  1 files changed, 10 insertions(+), 3 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -797,9 +797,16 @@
 
 .. class:: MatchObject
 
-   Match Objects always have a boolean value of :const:`True`, so that you can test
-   whether e.g. :func:`match` resulted in a match with a simple if statement.  They
-   support the following methods and attributes:
+   Match objects always have a boolean value of ``True``.
+   Since :meth:`~regex.match` and :meth:`~regex.search` return ``None``
+   when there is no match, you can test whether there was a match with a simple
+   ``if`` statement::
+
+      match = re.search(pattern, string)
+      if match:
+          process(match)
+
+   Match objects support the following methods and attributes:
 
 
    .. method:: MatchObject.expand(template)

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

From python-checkins at python.org  Sun Nov  4 06:00:20 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 06:00:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MzA0OiBjbGFy?=
 =?utf-8?q?ify_match_objects_docs=2E__Initial_patch_by_Jan_Duzinkiewicz=2E?=
Message-ID: <3XvPwN4PCFzRG5@mail.python.org>

http://hg.python.org/cpython/rev/1805fc284201
changeset:   80233:1805fc284201
branch:      3.2
parent:      80226:d8c47e199297
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 04 06:59:22 2012 +0200
summary:
  #16304: clarify match objects docs.  Initial patch by Jan Duzinkiewicz.

files:
  Doc/library/re.rst |  13 ++++++++++---
  1 files changed, 10 insertions(+), 3 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -814,9 +814,16 @@
 Match Objects
 -------------
 
-Match objects always have a boolean value of :const:`True`.  This lets you
-use a simple if-statement to test whether a match was found.  Match objects
-support the following methods and attributes:
+Match objects always have a boolean value of ``True``.
+Since :meth:`~regex.match` and :meth:`~regex.search` return ``None``
+when there is no match, you can test whether there was a match with a simple
+``if`` statement::
+
+   match = re.search(pattern, string)
+   if match:
+       process(match)
+
+Match objects support the following methods and attributes:
 
 
 .. method:: match.expand(template)

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

From python-checkins at python.org  Sun Nov  4 06:00:21 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 06:00:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316304=3A_merge_with_3=2E2=2E?=
Message-ID: <3XvPwP6VnmzRHf@mail.python.org>

http://hg.python.org/cpython/rev/7fde4b4f7e56
changeset:   80234:7fde4b4f7e56
branch:      3.3
parent:      80227:c69f9dcae45b
parent:      80233:1805fc284201
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 04 06:59:51 2012 +0200
summary:
  #16304: merge with 3.2.

files:
  Doc/library/re.rst |  13 ++++++++++---
  1 files changed, 10 insertions(+), 3 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -824,9 +824,16 @@
 Match Objects
 -------------
 
-Match objects always have a boolean value of :const:`True`.  This lets you
-use a simple if-statement to test whether a match was found.  Match objects
-support the following methods and attributes:
+Match objects always have a boolean value of ``True``.
+Since :meth:`~regex.match` and :meth:`~regex.search` return ``None``
+when there is no match, you can test whether there was a match with a simple
+``if`` statement::
+
+   match = re.search(pattern, string)
+   if match:
+       process(match)
+
+Match objects support the following methods and attributes:
 
 
 .. method:: match.expand(template)

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

From python-checkins at python.org  Sun Nov  4 06:00:23 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 06:00:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MzA0OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XvPwR1QCfzRJ3@mail.python.org>

http://hg.python.org/cpython/rev/63b45c959a2a
changeset:   80235:63b45c959a2a
parent:      80230:58776cc74e89
parent:      80234:7fde4b4f7e56
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 04 07:00:04 2012 +0200
summary:
  #16304: merge with 3.3.

files:
  Doc/library/re.rst |  13 ++++++++++---
  1 files changed, 10 insertions(+), 3 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -824,9 +824,16 @@
 Match Objects
 -------------
 
-Match objects always have a boolean value of :const:`True`.  This lets you
-use a simple if-statement to test whether a match was found.  Match objects
-support the following methods and attributes:
+Match objects always have a boolean value of ``True``.
+Since :meth:`~regex.match` and :meth:`~regex.search` return ``None``
+when there is no match, you can test whether there was a match with a simple
+``if`` statement::
+
+   match = re.search(pattern, string)
+   if match:
+       process(match)
+
+Match objects support the following methods and attributes:
 
 
 .. method:: match.expand(template)

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

From python-checkins at python.org  Sun Nov  4 12:48:12 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun,  4 Nov 2012 12:48:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDAy?=
 =?utf-8?q?=3A_In_range_slicing=2C_fix_shadowing_of_exceptions_from_=5F=5F?=
 =?utf-8?q?index=5F=5F?=
Message-ID: <3XvZz00j0vzRG8@mail.python.org>

http://hg.python.org/cpython/rev/94d15358ad6e
changeset:   80236:94d15358ad6e
branch:      3.2
parent:      80233:1805fc284201
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 04 11:46:17 2012 +0000
summary:
  Issue #16402: In range slicing, fix shadowing of exceptions from __index__ method.

files:
  Lib/test/test_range.py |   9 +++++++++
  Misc/NEWS              |   3 +++
  Objects/rangeobject.c  |  10 +++++-----
  3 files changed, 17 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -312,6 +312,15 @@
 
         self.assertRaises(TypeError, range, IN())
 
+        # Test use of user-defined classes in slice indices.
+        self.assertEqual(list(range(10)[:I(5)]), list(range(5)))
+
+        with self.assertRaises(RuntimeError):
+            range(0, 10)[:IX()]
+
+        with self.assertRaises(TypeError):
+            range(0, 10)[:IN()]
+
     def test_count(self):
         self.assertEqual(range(3).count(-1), 0)
         self.assertEqual(range(3).count(0), 1)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16402: When slicing a range, fix shadowing of exceptions from
+  __index__.
+
 - Issue #16336: fix input checking in the surrogatepass error handler.
   Patch by Serhiy Storchaka.
 
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -330,11 +330,11 @@
         if (PyIndex_Check(obj)) {
             result = PyNumber_Index(obj);
         }
-    }
-    if (result == NULL) {
-        PyErr_SetString(PyExc_TypeError,
-                        "slice indices must be integers or "
-                        "None or have an __index__ method");
+        else {
+            PyErr_SetString(PyExc_TypeError,
+                            "slice indices must be integers or "
+                            "None or have an __index__ method");
+        }
     }
     return result;
 }

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

From python-checkins at python.org  Sun Nov  4 12:48:13 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun,  4 Nov 2012 12:48:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316402=3A_Merge_fix_from_3=2E2?=
Message-ID: <3XvZz12shRzRGK@mail.python.org>

http://hg.python.org/cpython/rev/2b656a2cf7ef
changeset:   80237:2b656a2cf7ef
branch:      3.3
parent:      80234:7fde4b4f7e56
parent:      80236:94d15358ad6e
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 04 11:47:05 2012 +0000
summary:
  Issue #16402: Merge fix from 3.2

files:
  Lib/test/test_range.py |   9 +++++++++
  Misc/NEWS              |   3 +++
  Objects/rangeobject.c  |  10 +++++-----
  3 files changed, 17 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -312,6 +312,15 @@
 
         self.assertRaises(TypeError, range, IN())
 
+        # Test use of user-defined classes in slice indices.
+        self.assertEqual(list(range(10)[:I(5)]), list(range(5)))
+
+        with self.assertRaises(RuntimeError):
+            range(0, 10)[:IX()]
+
+        with self.assertRaises(TypeError):
+            range(0, 10)[:IN()]
+
     def test_count(self):
         self.assertEqual(range(3).count(-1), 0)
         self.assertEqual(range(3).count(0), 1)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16402: When slicing a range, fix shadowing of exceptions from
+  __index__.
+
 - Issue #16336: fix input checking in the surrogatepass error handler.
   Patch by Serhiy Storchaka.
 
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -331,11 +331,11 @@
         if (PyIndex_Check(obj)) {
             result = PyNumber_Index(obj);
         }
-    }
-    if (result == NULL) {
-        PyErr_SetString(PyExc_TypeError,
-                        "slice indices must be integers or "
-                        "None or have an __index__ method");
+        else {
+            PyErr_SetString(PyExc_TypeError,
+                            "slice indices must be integers or "
+                            "None or have an __index__ method");
+        }
     }
     return result;
 }

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

From python-checkins at python.org  Sun Nov  4 12:48:14 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun,  4 Nov 2012 12:48:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316402=3A_Merge_fix_from_3=2E3?=
Message-ID: <3XvZz25RbvzRGH@mail.python.org>

http://hg.python.org/cpython/rev/f02555353544
changeset:   80238:f02555353544
parent:      80235:63b45c959a2a
parent:      80237:2b656a2cf7ef
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 04 11:47:47 2012 +0000
summary:
  Issue #16402: Merge fix from 3.3

files:
  Lib/test/test_range.py |   9 +++++++++
  Misc/NEWS              |   3 +++
  Objects/rangeobject.c  |  10 +++++-----
  3 files changed, 17 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -312,6 +312,15 @@
 
         self.assertRaises(TypeError, range, IN())
 
+        # Test use of user-defined classes in slice indices.
+        self.assertEqual(range(10)[:I(5)], range(5))
+
+        with self.assertRaises(RuntimeError):
+            range(0, 10)[:IX()]
+
+        with self.assertRaises(TypeError):
+            range(0, 10)[:IN()]
+
     def test_count(self):
         self.assertEqual(range(3).count(-1), 0)
         self.assertEqual(range(3).count(0), 1)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16402: When slicing a range, fix shadowing of exceptions from
+  __index__.
+
 - Issue #16336: fix input checking in the surrogatepass error handler.
   Patch by Serhiy Storchaka.
 
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -331,11 +331,11 @@
         if (PyIndex_Check(obj)) {
             result = PyNumber_Index(obj);
         }
-    }
-    if (result == NULL) {
-        PyErr_SetString(PyExc_TypeError,
-                        "slice indices must be integers or "
-                        "None or have an __index__ method");
+        else {
+            PyErr_SetString(PyExc_TypeError,
+                            "slice indices must be integers or "
+                            "None or have an __index__ method");
+        }
     }
     return result;
 }

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

From python-checkins at python.org  Sun Nov  4 14:54:23 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun,  4 Nov 2012 14:54:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzU3NjU6?=
 =?utf-8?q?_Apply_a_hard_recursion_limit_in_the_compiler?=
Message-ID: <3Xvdmb1vqBzRFq@mail.python.org>

http://hg.python.org/cpython/rev/ab02cd145f56
changeset:   80239:ab02cd145f56
branch:      3.3
parent:      80237:2b656a2cf7ef
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Nov 04 23:14:34 2012 +1000
summary:
  Issue #5765: Apply a hard recursion limit in the compiler

Previously, excessive nesting in expressions would blow the
stack and segfault the interpreter. Now, a hard limit based
on the configured recursion limit and a hardcoded scaling
factor is applied.

files:
  Include/symtable.h                      |   2 +
  Lib/test/crashers/compiler_recursion.py |  13 -
  Lib/test/test_compile.py                |  27 +++
  Misc/ACKS                               |   1 +
  Misc/NEWS                               |   3 +
  Python/compile.c                        |   5 +
  Python/symtable.c                       |  97 +++++++++---
  7 files changed, 106 insertions(+), 42 deletions(-)


diff --git a/Include/symtable.h b/Include/symtable.h
--- a/Include/symtable.h
+++ b/Include/symtable.h
@@ -30,6 +30,8 @@
     PyObject *st_private;           /* name of current class or NULL */
     PyFutureFeatures *st_future;    /* module's future features that affect
                                        the symbol table */
+    int recursion_depth;            /* current recursion depth */
+    int recursion_limit;            /* recursion limit */
 };
 
 typedef struct _symtable_entry {
diff --git a/Lib/test/crashers/compiler_recursion.py b/Lib/test/crashers/compiler_recursion.py
deleted file mode 100644
--- a/Lib/test/crashers/compiler_recursion.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-The compiler (>= 2.5) recurses happily until it blows the stack.
-
-Recorded on the tracker as http://bugs.python.org/issue11383
-"""
-
-# The variant below blows up in compiler_call, but there are assorted
-# other variations that blow up in other functions
-# e.g. '1*'*10**5+'1' will die in compiler_visit_expr
-
-# The exact limit to destroy the stack will vary by platform
-# but 10M should do the trick even with huge stack allocations
-compile('()'*10**7, '?', 'exec')
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -474,6 +474,33 @@
         self.assertInvalidSingle('f()\nxy # blah\nblah()')
         self.assertInvalidSingle('x = 5 # comment\nx = 6\n')
 
+    @support.cpython_only
+    def test_compiler_recursion_limit(self):
+        # Expected limit is sys.getrecursionlimit() * the scaling factor
+        # in symtable.c (currently 3)
+        # We expect to fail *at* that limit, because we use up some of
+        # the stack depth limit in the test suite code
+        # So we check the expected limit and 75% of that
+        # XXX (ncoghlan): duplicating the scaling factor here is a little
+        # ugly. Perhaps it should be exposed somewhere...
+        fail_depth = sys.getrecursionlimit() * 3
+        success_depth = int(fail_depth * 0.75)
+
+        def check_limit(prefix, repeated):
+            expect_ok = prefix + repeated * success_depth
+            self.compile_single(expect_ok)
+            broken = prefix + repeated * fail_depth
+            details = "Compiling ({!r} + {!r} * {})".format(
+                         prefix, repeated, fail_depth)
+            with self.assertRaises(RuntimeError, msg=details):
+                self.compile_single(broken)
+
+        check_limit("a", "()")
+        check_limit("a", ".b")
+        check_limit("a", "[0]")
+        check_limit("a", "*a")
+
+
 def test_main():
     support.run_unittest(TestSpecifics)
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -431,6 +431,7 @@
 Nathaniel Gray
 Eddy De Greef
 Grant Griffin
+Andrea Griffini
 Duncan Grisby
 Fabian Groffen
 Eric Groo
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #5765: Apply a hard recursion limit in the compiler instead of
+  blowing the stack and segfaulting.
+
 - Issue #16402: When slicing a range, fix shadowing of exceptions from
   __index__.
 
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -141,6 +141,11 @@
 The u pointer points to the current compilation unit, while units
 for enclosing blocks are stored in c_stack.     The u and c_stack are
 managed by compiler_enter_scope() and compiler_exit_scope().
+
+Note that we don't track recursion levels during compilation - the
+task of detecting and rejecting excessive levels of nesting is
+handled by the symbol analysis pass.
+
 */
 
 struct compiler {
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -220,17 +220,40 @@
     return NULL;
 }
 
+/* When compiling the use of C stack is probably going to be a lot
+   lighter than when executing Python code but still can overflow
+   and causing a Python crash if not checked (e.g. eval("()"*300000)).
+   Using the current recursion limit for the compiler seems too
+   restrictive (it caused at least one test to fail) so a factor is
+   used to allow deeper recursion when compiling an expression.
+
+   Using a scaling factor means this should automatically adjust when
+   the recursion limit is adjusted for small or large C stack allocations.
+*/
+#define COMPILER_STACK_FRAME_SCALE 3
+
 struct symtable *
 PySymtable_Build(mod_ty mod, const char *filename, PyFutureFeatures *future)
 {
     struct symtable *st = symtable_new();
     asdl_seq *seq;
     int i;
+    PyThreadState *tstate;
 
     if (st == NULL)
         return st;
     st->st_filename = filename;
     st->st_future = future;
+
+    /* Setup recursion depth check counters */
+    tstate = PyThreadState_GET();
+    if (!tstate) {
+        PySymtable_Free(st);
+        return NULL;
+    }
+    st->recursion_depth = tstate->recursion_depth * COMPILER_STACK_FRAME_SCALE;
+    st->recursion_limit = Py_GetRecursionLimit() * COMPILER_STACK_FRAME_SCALE;
+
     /* Make the initial symbol information gathering pass */
     if (!GET_IDENTIFIER(top) ||
         !symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0, 0)) {
@@ -1013,11 +1036,17 @@
 
    VISIT_SEQ_TAIL permits the start of an ASDL sequence to be skipped, which is
    useful if the first node in the sequence requires special treatment.
+
+   VISIT_QUIT macro returns the specified value exiting from the function but
+   first adjusts current recursion counter depth.
 */
 
+#define VISIT_QUIT(ST, X) \
+    return --(ST)->recursion_depth,(X)
+
 #define VISIT(ST, TYPE, V) \
     if (!symtable_visit_ ## TYPE((ST), (V))) \
-        return 0;
+        VISIT_QUIT((ST), 0);
 
 #define VISIT_SEQ(ST, TYPE, SEQ) { \
     int i; \
@@ -1025,7 +1054,7 @@
     for (i = 0; i < asdl_seq_LEN(seq); i++) { \
         TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
         if (!symtable_visit_ ## TYPE((ST), elt)) \
-            return 0; \
+            VISIT_QUIT((ST), 0);                 \
     } \
 }
 
@@ -1035,7 +1064,7 @@
     for (i = (START); i < asdl_seq_LEN(seq); i++) { \
         TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
         if (!symtable_visit_ ## TYPE((ST), elt)) \
-            return 0; \
+            VISIT_QUIT((ST), 0);                 \
     } \
 }
 
@@ -1046,7 +1075,7 @@
         expr_ty elt = (expr_ty)asdl_seq_GET(seq, i); \
         if (!elt) continue; /* can be NULL */ \
         if (!symtable_visit_expr((ST), elt)) \
-            return 0; \
+            VISIT_QUIT((ST), 0);             \
     } \
 }
 
@@ -1071,32 +1100,37 @@
 static int
 symtable_visit_stmt(struct symtable *st, stmt_ty s)
 {
+    if (++st->recursion_depth > st->recursion_limit) {
+        PyErr_SetString(PyExc_RuntimeError,
+                        "maximum recursion depth exceeded during compilation");
+        VISIT_QUIT(st, 0);
+    }
     switch (s->kind) {
     case FunctionDef_kind:
         if (!symtable_add_def(st, s->v.FunctionDef.name, DEF_LOCAL))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (s->v.FunctionDef.args->defaults)
             VISIT_SEQ(st, expr, s->v.FunctionDef.args->defaults);
         if (s->v.FunctionDef.args->kw_defaults)
             VISIT_KWONLYDEFAULTS(st,
                                s->v.FunctionDef.args->kw_defaults);
         if (!symtable_visit_annotations(st, s))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (s->v.FunctionDef.decorator_list)
             VISIT_SEQ(st, expr, s->v.FunctionDef.decorator_list);
         if (!symtable_enter_block(st, s->v.FunctionDef.name,
                                   FunctionBlock, (void *)s, s->lineno,
                                   s->col_offset))
-            return 0;
+            VISIT_QUIT(st, 0);
         VISIT(st, arguments, s->v.FunctionDef.args);
         VISIT_SEQ(st, stmt, s->v.FunctionDef.body);
         if (!symtable_exit_block(st, s))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case ClassDef_kind: {
         PyObject *tmp;
         if (!symtable_add_def(st, s->v.ClassDef.name, DEF_LOCAL))
-            return 0;
+            VISIT_QUIT(st, 0);
         VISIT_SEQ(st, expr, s->v.ClassDef.bases);
         VISIT_SEQ(st, keyword, s->v.ClassDef.keywords);
         if (s->v.ClassDef.starargs)
@@ -1107,20 +1141,20 @@
             VISIT_SEQ(st, expr, s->v.ClassDef.decorator_list);
         if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
                                   (void *)s, s->lineno, s->col_offset))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (!GET_IDENTIFIER(__class__) ||
             !symtable_add_def(st, __class__, DEF_LOCAL) ||
             !GET_IDENTIFIER(__locals__) ||
             !symtable_add_def(st, __locals__, DEF_PARAM)) {
             symtable_exit_block(st, s);
-            return 0;
+            VISIT_QUIT(st, 0);
         }
         tmp = st->st_private;
         st->st_private = s->v.ClassDef.name;
         VISIT_SEQ(st, stmt, s->v.ClassDef.body);
         st->st_private = tmp;
         if (!symtable_exit_block(st, s))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     }
     case Return_kind:
@@ -1204,7 +1238,7 @@
             identifier name = (identifier)asdl_seq_GET(seq, i);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
-                return 0;
+                VISIT_QUIT(st, 0);
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
                 char *c_name = _PyUnicode_AsString(name);
@@ -1219,10 +1253,10 @@
                                   GLOBAL_AFTER_USE,
                                   c_name);
                 if (!symtable_warn(st, buf, s->lineno))
-                    return 0;
+                    VISIT_QUIT(st, 0);
             }
             if (!symtable_add_def(st, name, DEF_GLOBAL))
-                return 0;
+                VISIT_QUIT(st, 0);
         }
         break;
     }
@@ -1233,7 +1267,7 @@
             identifier name = (identifier)asdl_seq_GET(seq, i);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
-                return 0;
+                VISIT_QUIT(st, 0);
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
                 char *c_name = _PyUnicode_AsString(name);
@@ -1248,10 +1282,10 @@
                                   NONLOCAL_AFTER_USE,
                                   c_name);
                 if (!symtable_warn(st, buf, s->lineno))
-                    return 0;
+                    VISIT_QUIT(st, 0);
             }
             if (!symtable_add_def(st, name, DEF_NONLOCAL))
-                return 0;
+                VISIT_QUIT(st, 0);
         }
         break;
     }
@@ -1268,12 +1302,17 @@
         VISIT_SEQ(st, stmt, s->v.With.body);
         break;
     }
-    return 1;
+    VISIT_QUIT(st, 1);
 }
 
 static int
 symtable_visit_expr(struct symtable *st, expr_ty e)
 {
+    if (++st->recursion_depth > st->recursion_limit) {
+        PyErr_SetString(PyExc_RuntimeError,
+                        "maximum recursion depth exceeded during compilation");
+        VISIT_QUIT(st, 0);
+    }
     switch (e->kind) {
     case BoolOp_kind:
         VISIT_SEQ(st, expr, e->v.BoolOp.values);
@@ -1287,7 +1326,7 @@
         break;
     case Lambda_kind: {
         if (!GET_IDENTIFIER(lambda))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (e->v.Lambda.args->defaults)
             VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
         if (e->v.Lambda.args->kw_defaults)
@@ -1296,11 +1335,11 @@
         if (!symtable_enter_block(st, lambda,
                                   FunctionBlock, (void *)e, e->lineno,
                                   e->col_offset))
-            return 0;
+            VISIT_QUIT(st, 0);
         VISIT(st, arguments, e->v.Lambda.args);
         VISIT(st, expr, e->v.Lambda.body);
         if (!symtable_exit_block(st, (void *)e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     }
     case IfExp_kind:
@@ -1317,19 +1356,19 @@
         break;
     case GeneratorExp_kind:
         if (!symtable_visit_genexp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case ListComp_kind:
         if (!symtable_visit_listcomp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case SetComp_kind:
         if (!symtable_visit_setcomp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case DictComp_kind:
         if (!symtable_visit_dictcomp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case Yield_kind:
     case YieldFrom_kind: {
@@ -1373,14 +1412,14 @@
     case Name_kind:
         if (!symtable_add_def(st, e->v.Name.id,
                               e->v.Name.ctx == Load ? USE : DEF_LOCAL))
-            return 0;
+            VISIT_QUIT(st, 0);
         /* Special-case super: it counts as a use of __class__ */
         if (e->v.Name.ctx == Load &&
             st->st_cur->ste_type == FunctionBlock &&
             !PyUnicode_CompareWithASCIIString(e->v.Name.id, "super")) {
             if (!GET_IDENTIFIER(__class__) ||
                 !symtable_add_def(st, __class__, USE))
-                return 0;
+                VISIT_QUIT(st, 0);
         }
         break;
     /* child nodes of List and Tuple will have expr_context set */
@@ -1391,7 +1430,7 @@
         VISIT_SEQ(st, expr, e->v.Tuple.elts);
         break;
     }
-    return 1;
+    VISIT_QUIT(st, 1);
 }
 
 static int

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

From python-checkins at python.org  Sun Nov  4 14:54:24 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun,  4 Nov 2012 14:54:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=235765=3A_Merge_from_3=2E3?=
Message-ID: <3Xvdmc5qthzRFy@mail.python.org>

http://hg.python.org/cpython/rev/bd1db93d76e1
changeset:   80240:bd1db93d76e1
parent:      80238:f02555353544
parent:      80239:ab02cd145f56
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Nov 04 23:53:15 2012 +1000
summary:
  Issue #5765: Merge from 3.3

files:
  Include/symtable.h                      |    2 +
  Lib/test/crashers/compiler_recursion.py |   13 -
  Lib/test/test_compile.py                |   27 +++
  Misc/ACKS                               |    1 +
  Misc/NEWS                               |    3 +
  Python/compile.c                        |    5 +
  Python/symtable.c                       |  101 ++++++++---
  7 files changed, 108 insertions(+), 44 deletions(-)


diff --git a/Include/symtable.h b/Include/symtable.h
--- a/Include/symtable.h
+++ b/Include/symtable.h
@@ -30,6 +30,8 @@
     PyObject *st_private;           /* name of current class or NULL */
     PyFutureFeatures *st_future;    /* module's future features that affect
                                        the symbol table */
+    int recursion_depth;            /* current recursion depth */
+    int recursion_limit;            /* recursion limit */
 };
 
 typedef struct _symtable_entry {
diff --git a/Lib/test/crashers/compiler_recursion.py b/Lib/test/crashers/compiler_recursion.py
deleted file mode 100644
--- a/Lib/test/crashers/compiler_recursion.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-The compiler (>= 2.5) recurses happily until it blows the stack.
-
-Recorded on the tracker as http://bugs.python.org/issue11383
-"""
-
-# The variant below blows up in compiler_call, but there are assorted
-# other variations that blow up in other functions
-# e.g. '1*'*10**5+'1' will die in compiler_visit_expr
-
-# The exact limit to destroy the stack will vary by platform
-# but 10M should do the trick even with huge stack allocations
-compile('()'*10**7, '?', 'exec')
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -474,6 +474,33 @@
         self.assertInvalidSingle('f()\nxy # blah\nblah()')
         self.assertInvalidSingle('x = 5 # comment\nx = 6\n')
 
+    @support.cpython_only
+    def test_compiler_recursion_limit(self):
+        # Expected limit is sys.getrecursionlimit() * the scaling factor
+        # in symtable.c (currently 3)
+        # We expect to fail *at* that limit, because we use up some of
+        # the stack depth limit in the test suite code
+        # So we check the expected limit and 75% of that
+        # XXX (ncoghlan): duplicating the scaling factor here is a little
+        # ugly. Perhaps it should be exposed somewhere...
+        fail_depth = sys.getrecursionlimit() * 3
+        success_depth = int(fail_depth * 0.75)
+
+        def check_limit(prefix, repeated):
+            expect_ok = prefix + repeated * success_depth
+            self.compile_single(expect_ok)
+            broken = prefix + repeated * fail_depth
+            details = "Compiling ({!r} + {!r} * {})".format(
+                         prefix, repeated, fail_depth)
+            with self.assertRaises(RuntimeError, msg=details):
+                self.compile_single(broken)
+
+        check_limit("a", "()")
+        check_limit("a", ".b")
+        check_limit("a", "[0]")
+        check_limit("a", "*a")
+
+
 def test_main():
     support.run_unittest(TestSpecifics)
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -431,6 +431,7 @@
 Nathaniel Gray
 Eddy De Greef
 Grant Griffin
+Andrea Griffini
 Duncan Grisby
 Fabian Groffen
 Eric Groo
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #5765: Apply a hard recursion limit in the compiler instead of
+  blowing the stack and segfaulting.
+
 - Issue #16402: When slicing a range, fix shadowing of exceptions from
   __index__.
 
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -141,6 +141,11 @@
 The u pointer points to the current compilation unit, while units
 for enclosing blocks are stored in c_stack.     The u and c_stack are
 managed by compiler_enter_scope() and compiler_exit_scope().
+
+Note that we don't track recursion levels during compilation - the
+task of detecting and rejecting excessive levels of nesting is
+handled by the symbol analysis pass.
+
 */
 
 struct compiler {
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -223,17 +223,40 @@
     return NULL;
 }
 
+/* When compiling the use of C stack is probably going to be a lot
+   lighter than when executing Python code but still can overflow
+   and causing a Python crash if not checked (e.g. eval("()"*300000)).
+   Using the current recursion limit for the compiler seems too
+   restrictive (it caused at least one test to fail) so a factor is
+   used to allow deeper recursion when compiling an expression.
+
+   Using a scaling factor means this should automatically adjust when
+   the recursion limit is adjusted for small or large C stack allocations.
+*/
+#define COMPILER_STACK_FRAME_SCALE 3
+
 struct symtable *
 PySymtable_Build(mod_ty mod, const char *filename, PyFutureFeatures *future)
 {
     struct symtable *st = symtable_new();
     asdl_seq *seq;
     int i;
+    PyThreadState *tstate;
 
     if (st == NULL)
         return st;
     st->st_filename = filename;
     st->st_future = future;
+
+    /* Setup recursion depth check counters */
+    tstate = PyThreadState_GET();
+    if (!tstate) {
+        PySymtable_Free(st);
+        return NULL;
+    }
+    st->recursion_depth = tstate->recursion_depth * COMPILER_STACK_FRAME_SCALE;
+    st->recursion_limit = Py_GetRecursionLimit() * COMPILER_STACK_FRAME_SCALE;
+
     /* Make the initial symbol information gathering pass */
     if (!GET_IDENTIFIER(top) ||
         !symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0, 0)) {
@@ -1031,11 +1054,17 @@
 
    VISIT_SEQ_TAIL permits the start of an ASDL sequence to be skipped, which is
    useful if the first node in the sequence requires special treatment.
+
+   VISIT_QUIT macro returns the specified value exiting from the function but
+   first adjusts current recursion counter depth.
 */
 
+#define VISIT_QUIT(ST, X) \
+    return --(ST)->recursion_depth,(X)
+
 #define VISIT(ST, TYPE, V) \
     if (!symtable_visit_ ## TYPE((ST), (V))) \
-        return 0;
+        VISIT_QUIT((ST), 0);
 
 #define VISIT_SEQ(ST, TYPE, SEQ) { \
     int i; \
@@ -1043,7 +1072,7 @@
     for (i = 0; i < asdl_seq_LEN(seq); i++) { \
         TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
         if (!symtable_visit_ ## TYPE((ST), elt)) \
-            return 0; \
+            VISIT_QUIT((ST), 0);                 \
     } \
 }
 
@@ -1053,7 +1082,7 @@
     for (i = (START); i < asdl_seq_LEN(seq); i++) { \
         TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
         if (!symtable_visit_ ## TYPE((ST), elt)) \
-            return 0; \
+            VISIT_QUIT((ST), 0);                 \
     } \
 }
 
@@ -1064,7 +1093,7 @@
         expr_ty elt = (expr_ty)asdl_seq_GET(seq, i); \
         if (!elt) continue; /* can be NULL */ \
         if (!symtable_visit_expr((ST), elt)) \
-            return 0; \
+            VISIT_QUIT((ST), 0);             \
     } \
 }
 
@@ -1108,32 +1137,37 @@
 static int
 symtable_visit_stmt(struct symtable *st, stmt_ty s)
 {
+    if (++st->recursion_depth > st->recursion_limit) {
+        PyErr_SetString(PyExc_RuntimeError,
+                        "maximum recursion depth exceeded during compilation");
+        VISIT_QUIT(st, 0);
+    }
     switch (s->kind) {
     case FunctionDef_kind:
         if (!symtable_add_def(st, s->v.FunctionDef.name, DEF_LOCAL))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (s->v.FunctionDef.args->defaults)
             VISIT_SEQ(st, expr, s->v.FunctionDef.args->defaults);
         if (s->v.FunctionDef.args->kw_defaults)
             VISIT_KWONLYDEFAULTS(st,
                                s->v.FunctionDef.args->kw_defaults);
         if (!symtable_visit_annotations(st, s))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (s->v.FunctionDef.decorator_list)
             VISIT_SEQ(st, expr, s->v.FunctionDef.decorator_list);
         if (!symtable_enter_block(st, s->v.FunctionDef.name,
                                   FunctionBlock, (void *)s, s->lineno,
                                   s->col_offset))
-            return 0;
+            VISIT_QUIT(st, 0);
         VISIT(st, arguments, s->v.FunctionDef.args);
         VISIT_SEQ(st, stmt, s->v.FunctionDef.body);
         if (!symtable_exit_block(st, s))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case ClassDef_kind: {
         PyObject *tmp;
         if (!symtable_add_def(st, s->v.ClassDef.name, DEF_LOCAL))
-            return 0;
+            VISIT_QUIT(st, 0);
         VISIT_SEQ(st, expr, s->v.ClassDef.bases);
         VISIT_SEQ(st, keyword, s->v.ClassDef.keywords);
         if (s->v.ClassDef.starargs)
@@ -1144,20 +1178,20 @@
             VISIT_SEQ(st, expr, s->v.ClassDef.decorator_list);
         if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
                                   (void *)s, s->lineno, s->col_offset))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (!GET_IDENTIFIER(__class__) ||
             !symtable_add_def(st, __class__, DEF_LOCAL) ||
             !GET_IDENTIFIER(__locals__) ||
             !symtable_add_def(st, __locals__, DEF_PARAM)) {
             symtable_exit_block(st, s);
-            return 0;
+            VISIT_QUIT(st, 0);
         }
         tmp = st->st_private;
         st->st_private = s->v.ClassDef.name;
         VISIT_SEQ(st, stmt, s->v.ClassDef.body);
         st->st_private = tmp;
         if (!symtable_exit_block(st, s))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     }
     case Return_kind:
@@ -1241,7 +1275,7 @@
             identifier name = (identifier)asdl_seq_GET(seq, i);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
-                return 0;
+                VISIT_QUIT(st, 0);
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
                 char *c_name = _PyUnicode_AsString(name);
@@ -1256,12 +1290,12 @@
                                   GLOBAL_AFTER_USE,
                                   c_name);
                 if (!symtable_warn(st, buf, s->lineno))
-                    return 0;
+                    VISIT_QUIT(st, 0);
             }
             if (!symtable_add_def(st, name, DEF_GLOBAL))
-                return 0;
+                VISIT_QUIT(st, 0);
             if (!symtable_record_directive(st, name, s))
-                return 0;
+                VISIT_QUIT(st, 0);
         }
         break;
     }
@@ -1272,7 +1306,7 @@
             identifier name = (identifier)asdl_seq_GET(seq, i);
             long cur = symtable_lookup(st, name);
             if (cur < 0)
-                return 0;
+                VISIT_QUIT(st, 0);
             if (cur & (DEF_LOCAL | USE)) {
                 char buf[256];
                 char *c_name = _PyUnicode_AsString(name);
@@ -1287,12 +1321,12 @@
                                   NONLOCAL_AFTER_USE,
                                   c_name);
                 if (!symtable_warn(st, buf, s->lineno))
-                    return 0;
+                    VISIT_QUIT(st, 0);
             }
             if (!symtable_add_def(st, name, DEF_NONLOCAL))
-                return 0;
+                VISIT_QUIT(st, 0);
             if (!symtable_record_directive(st, name, s))
-                return 0;
+                VISIT_QUIT(st, 0);
         }
         break;
     }
@@ -1309,12 +1343,17 @@
         VISIT_SEQ(st, stmt, s->v.With.body);
         break;
     }
-    return 1;
+    VISIT_QUIT(st, 1);
 }
 
 static int
 symtable_visit_expr(struct symtable *st, expr_ty e)
 {
+    if (++st->recursion_depth > st->recursion_limit) {
+        PyErr_SetString(PyExc_RuntimeError,
+                        "maximum recursion depth exceeded during compilation");
+        VISIT_QUIT(st, 0);
+    }
     switch (e->kind) {
     case BoolOp_kind:
         VISIT_SEQ(st, expr, e->v.BoolOp.values);
@@ -1328,7 +1367,7 @@
         break;
     case Lambda_kind: {
         if (!GET_IDENTIFIER(lambda))
-            return 0;
+            VISIT_QUIT(st, 0);
         if (e->v.Lambda.args->defaults)
             VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
         if (e->v.Lambda.args->kw_defaults)
@@ -1337,11 +1376,11 @@
         if (!symtable_enter_block(st, lambda,
                                   FunctionBlock, (void *)e, e->lineno,
                                   e->col_offset))
-            return 0;
+            VISIT_QUIT(st, 0);
         VISIT(st, arguments, e->v.Lambda.args);
         VISIT(st, expr, e->v.Lambda.body);
         if (!symtable_exit_block(st, (void *)e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     }
     case IfExp_kind:
@@ -1358,19 +1397,19 @@
         break;
     case GeneratorExp_kind:
         if (!symtable_visit_genexp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case ListComp_kind:
         if (!symtable_visit_listcomp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case SetComp_kind:
         if (!symtable_visit_setcomp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case DictComp_kind:
         if (!symtable_visit_dictcomp(st, e))
-            return 0;
+            VISIT_QUIT(st, 0);
         break;
     case Yield_kind:
     case YieldFrom_kind: {
@@ -1414,14 +1453,14 @@
     case Name_kind:
         if (!symtable_add_def(st, e->v.Name.id,
                               e->v.Name.ctx == Load ? USE : DEF_LOCAL))
-            return 0;
+            VISIT_QUIT(st, 0);
         /* Special-case super: it counts as a use of __class__ */
         if (e->v.Name.ctx == Load &&
             st->st_cur->ste_type == FunctionBlock &&
             !PyUnicode_CompareWithASCIIString(e->v.Name.id, "super")) {
             if (!GET_IDENTIFIER(__class__) ||
                 !symtable_add_def(st, __class__, USE))
-                return 0;
+                VISIT_QUIT(st, 0);
         }
         break;
     /* child nodes of List and Tuple will have expr_context set */
@@ -1432,7 +1471,7 @@
         VISIT_SEQ(st, expr, e->v.Tuple.elts);
         break;
     }
-    return 1;
+    VISIT_QUIT(st, 1);
 }
 
 static int

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

From python-checkins at python.org  Sun Nov  4 15:20:02 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun,  4 Nov 2012 15:20:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzU3NjU6?=
 =?utf-8?q?_Also_check_the_compiler_when_finding_the_recursion_limit?=
Message-ID: <3XvfLB1y4CzMQL@mail.python.org>

http://hg.python.org/cpython/rev/cf2515d0328b
changeset:   80241:cf2515d0328b
branch:      3.3
parent:      80239:ab02cd145f56
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 00:19:18 2012 +1000
summary:
  Issue #5765: Also check the compiler when finding the recursion limit

files:
  Tools/scripts/find_recursionlimit.py |  7 +++++++
  1 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Tools/scripts/find_recursionlimit.py b/Tools/scripts/find_recursionlimit.py
--- a/Tools/scripts/find_recursionlimit.py
+++ b/Tools/scripts/find_recursionlimit.py
@@ -89,6 +89,12 @@
         _pickle.Pickler(io.BytesIO(), protocol=-1).dump(l)
         _cache[n] = l
 
+def test_compiler_recursion():
+    # The compiler uses a scaling factor to support additional levels
+    # of recursion. This is a sanity check of that scaling to ensure
+    # it still throws RuntimeError even at higher recursion limits
+    compile("()" * (10 * sys.getrecursionlimit()), "<single>", "single")
+
 def check_limit(n, test_func_name):
     sys.setrecursionlimit(n)
     if test_func_name.startswith("test_"):
@@ -117,5 +123,6 @@
         check_limit(limit, "test_getattr")
         check_limit(limit, "test_getitem")
         check_limit(limit, "test_cpickle")
+        check_limit(limit, "test_compiler_recursion")
         print("Limit of %d is fine" % limit)
         limit = limit + 100

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

From python-checkins at python.org  Sun Nov  4 15:20:03 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun,  4 Nov 2012 15:20:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=235765=3A_Merge_from_3=2E3?=
Message-ID: <3XvfLC46gCzRG4@mail.python.org>

http://hg.python.org/cpython/rev/3712028a0c34
changeset:   80242:3712028a0c34
parent:      80240:bd1db93d76e1
parent:      80241:cf2515d0328b
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 00:19:49 2012 +1000
summary:
  Issue #5765: Merge from 3.3

files:
  Tools/scripts/find_recursionlimit.py |  7 +++++++
  1 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Tools/scripts/find_recursionlimit.py b/Tools/scripts/find_recursionlimit.py
--- a/Tools/scripts/find_recursionlimit.py
+++ b/Tools/scripts/find_recursionlimit.py
@@ -89,6 +89,12 @@
         _pickle.Pickler(io.BytesIO(), protocol=-1).dump(l)
         _cache[n] = l
 
+def test_compiler_recursion():
+    # The compiler uses a scaling factor to support additional levels
+    # of recursion. This is a sanity check of that scaling to ensure
+    # it still throws RuntimeError even at higher recursion limits
+    compile("()" * (10 * sys.getrecursionlimit()), "<single>", "single")
+
 def check_limit(n, test_func_name):
     sys.setrecursionlimit(n)
     if test_func_name.startswith("test_"):
@@ -117,5 +123,6 @@
         check_limit(limit, "test_getattr")
         check_limit(limit, "test_getitem")
         check_limit(limit, "test_cpickle")
+        check_limit(limit, "test_compiler_recursion")
         print("Limit of %d is fine" % limit)
         limit = limit + 100

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

From python-checkins at python.org  Sun Nov  4 15:56:11 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun,  4 Nov 2012 15:56:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Properly_credi?=
	=?utf-8?q?t_patch?=
Message-ID: <3Xvg7v2ws6zRCP@mail.python.org>

http://hg.python.org/cpython/rev/549f7b5baa83
changeset:   80243:549f7b5baa83
branch:      3.3
parent:      80241:cf2515d0328b
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 00:55:46 2012 +1000
summary:
  Properly credit patch

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
@@ -13,7 +13,7 @@
 -----------------
 
 - Issue #5765: Apply a hard recursion limit in the compiler instead of
-  blowing the stack and segfaulting.
+  blowing the stack and segfaulting. Initial patch by Andrea Griffini.
 
 - Issue #16402: When slicing a range, fix shadowing of exceptions from
   __index__.

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

From python-checkins at python.org  Sun Nov  4 15:56:12 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun,  4 Nov 2012 15:56:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Merge_from_3=2E3?=
Message-ID: <3Xvg7w5QzPzRGZ@mail.python.org>

http://hg.python.org/cpython/rev/4a9dbd9b152e
changeset:   80244:4a9dbd9b152e
parent:      80242:3712028a0c34
parent:      80243:549f7b5baa83
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 00:56:02 2012 +1000
summary:
  Merge from 3.3

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
@@ -11,7 +11,7 @@
 -----------------
 
 - Issue #5765: Apply a hard recursion limit in the compiler instead of
-  blowing the stack and segfaulting.
+  blowing the stack and segfaulting. Initial patch by Andrea Griffini.
 
 - Issue #16402: When slicing a range, fix shadowing of exceptions from
   __index__.

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

From python-checkins at python.org  Sun Nov  4 21:05:39 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun,  4 Nov 2012 21:05:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_copy=26paste_errors_an?=
	=?utf-8?q?d_reformulate_the_tests=2E?=
Message-ID: <3Xvp0z6jbtzRKJ@mail.python.org>

http://hg.python.org/cpython/rev/fc8f1b1c76bf
changeset:   80245:fc8f1b1c76bf
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Nov 04 20:53:50 2012 +0100
summary:
  Fix copy&paste errors and reformulate the tests.

files:
  Lib/test/test_buffer.py |  20 +++++---------------
  1 files changed, 5 insertions(+), 15 deletions(-)


diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -4001,23 +4001,13 @@
 
         # equality-hash invariant
         x = ndarray(list(range(12)), shape=[12], format='B')
-        a = memoryview(nd)
+        a = memoryview(x)
 
         y = ndarray(list(range(12)), shape=[12], format='b')
-        b = memoryview(nd)
-
-        z = ndarray(list(bytes(chr(x), 'latin-1') for x in range(12)),
-                    shape=[12], format='c')
-        c = memoryview(nd)
-
-        if (a == b):
-            self.assertEqual(hash(a), hash(b))
-
-        if (a == c):
-            self.assertEqual(hash(a), hash(c))
-
-        if (b == c):
-            self.assertEqual(hash(b), hash(c))
+        b = memoryview(y)
+
+        self.assertEqual(a, b)
+        self.assertEqual(hash(a), hash(b))
 
         # non-byte formats
         nd = ndarray(list(range(12)), shape=[2,2,3], format='L')

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

From python-checkins at python.org  Sun Nov  4 22:23:37 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 22:23:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzgyNzE6IHRoZSB1?=
 =?utf-8?q?tf-8_decoder_now_outputs_the_correct_number_of_U+FFFD__characte?=
 =?utf-8?q?rs?=
Message-ID: <3Xvqkx4DnWzRBH@mail.python.org>

http://hg.python.org/cpython/rev/5962f192a483
changeset:   80246:5962f192a483
branch:      3.3
parent:      80243:549f7b5baa83
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 04 23:21:38 2012 +0200
summary:
  #8271: the utf-8 decoder now outputs the correct number of U+FFFD  characters when used with the "replace" error handler on invalid utf-8 sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.

files:
  Lib/test/test_unicode.py   |  222 ++++++++++++++++++++++++-
  Misc/NEWS                  |    6 +-
  Objects/stringlib/codecs.h |   92 ++++++---
  Objects/unicodeobject.c    |   10 +-
  4 files changed, 292 insertions(+), 38 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1349,7 +1349,7 @@
             # with start byte of a 2-byte sequence
             (b'\xc2', FFFD), # only the start byte
             (b'\xc2\xc2', FFFD*2), # 2 start bytes
-            (b'\xc2\xc2\xc2', FFFD*3), # 2 start bytes
+            (b'\xc2\xc2\xc2', FFFD*3), # 3 start bytes
             (b'\xc2\x41', FFFD+'A'), # invalid continuation byte
             # with start byte of a 3-byte sequence
             (b'\xe1', FFFD), # only the start byte
@@ -1419,6 +1419,226 @@
             self.assertEqual(seq.decode('utf-8', 'ignore'),
                              res.replace('\uFFFD', ''))
 
+    def to_bytestring(self, seq):
+        return bytes(int(c, 16) for c in seq.split())
+
+    def assertCorrectUTF8Decoding(self, seq, res, err):
+        """
+        Check that an invalid UTF-8 sequence raises an UnicodeDecodeError when
+        'strict' is used, returns res when 'replace' is used, and that doesn't
+        return anything when 'ignore' is used.
+        """
+        with self.assertRaises(UnicodeDecodeError) as cm:
+            seq.decode('utf-8')
+        exc = cm.exception
+
+        self.assertIn(err, str(exc))
+        self.assertEqual(seq.decode('utf-8', 'replace'), res)
+        self.assertEqual((b'aaaa' + seq + b'bbbb').decode('utf-8', 'replace'),
+                         'aaaa' + res + 'bbbb')
+        res = res.replace('\ufffd', '')
+        self.assertEqual(seq.decode('utf-8', 'ignore'), res)
+        self.assertEqual((b'aaaa' + seq + b'bbbb').decode('utf-8', 'ignore'),
+                          'aaaa' + res + 'bbbb')
+
+    def test_invalid_start_byte(self):
+        """
+        Test that an 'invalid start byte' error is raised when the first byte
+        is not in the ASCII range or is not a valid start byte of a 2-, 3-, or
+        4-bytes sequence. The invalid start byte is replaced with a single
+        U+FFFD when errors='replace'.
+        E.g. <80> is a continuation byte and can appear only after a start byte.
+        """
+        FFFD = '\ufffd'
+        for byte in b'\x80\xA0\x9F\xBF\xC0\xC1\xF5\xFF':
+            self.assertCorrectUTF8Decoding(bytes([byte]), '\ufffd',
+                                           'invalid start byte')
+
+    def test_unexpected_end_of_data(self):
+        """
+        Test that an 'unexpected end of data' error is raised when the string
+        ends after a start byte of a 2-, 3-, or 4-bytes sequence without having
+        enough continuation bytes.  The incomplete sequence is replaced with a
+        single U+FFFD when errors='replace'.
+        E.g. in the sequence <F3 80 80>, F3 is the start byte of a 4-bytes
+        sequence, but it's followed by only 2 valid continuation bytes and the
+        last continuation bytes is missing.
+        Note: the continuation bytes must be all valid, if one of them is
+        invalid another error will be raised.
+        """
+        sequences = [
+            'C2', 'DF',
+            'E0 A0', 'E0 BF', 'E1 80', 'E1 BF', 'EC 80', 'EC BF',
+            'ED 80', 'ED 9F', 'EE 80', 'EE BF', 'EF 80', 'EF BF',
+            'F0 90', 'F0 BF', 'F0 90 80', 'F0 90 BF', 'F0 BF 80', 'F0 BF BF',
+            'F1 80', 'F1 BF', 'F1 80 80', 'F1 80 BF', 'F1 BF 80', 'F1 BF BF',
+            'F3 80', 'F3 BF', 'F3 80 80', 'F3 80 BF', 'F3 BF 80', 'F3 BF BF',
+            'F4 80', 'F4 8F', 'F4 80 80', 'F4 80 BF', 'F4 8F 80', 'F4 8F BF'
+        ]
+        FFFD = '\ufffd'
+        for seq in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), '\ufffd',
+                                           'unexpected end of data')
+
+    def test_invalid_cb_for_2bytes_seq(self):
+        """
+        Test that an 'invalid continuation byte' error is raised when the
+        continuation byte of a 2-bytes sequence is invalid.  The start byte
+        is replaced by a single U+FFFD and the second byte is handled
+        separately when errors='replace'.
+        E.g. in the sequence <C2 41>, C2 is the start byte of a 2-bytes
+        sequence, but 41 is not a valid continuation byte because it's the
+        ASCII letter 'A'.
+        """
+        FFFD = '\ufffd'
+        FFFDx2 = FFFD * 2
+        sequences = [
+            ('C2 00', FFFD+'\x00'), ('C2 7F', FFFD+'\x7f'),
+            ('C2 C0', FFFDx2), ('C2 FF', FFFDx2),
+            ('DF 00', FFFD+'\x00'), ('DF 7F', FFFD+'\x7f'),
+            ('DF C0', FFFDx2), ('DF FF', FFFDx2),
+        ]
+        for seq, res in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), res,
+                                           'invalid continuation byte')
+
+    def test_invalid_cb_for_3bytes_seq(self):
+        """
+        Test that an 'invalid continuation byte' error is raised when the
+        continuation byte(s) of a 3-bytes sequence are invalid.  When
+        errors='replace', if the first continuation byte is valid, the first
+        two bytes (start byte + 1st cb) are replaced by a single U+FFFD and the
+        third byte is handled separately, otherwise only the start byte is
+        replaced with a U+FFFD and the other continuation bytes are handled
+        separately.
+        E.g. in the sequence <E1 80 41>, E1 is the start byte of a 3-bytes
+        sequence, 80 is a valid continuation byte, but 41 is not a valid cb
+        because it's the ASCII letter 'A'.
+        Note: when the start byte is E0 or ED, the valid ranges for the first
+        continuation byte are limited to A0..BF and 80..9F respectively.
+        Python 2 used to consider all the bytes in range 80..BF valid when the
+        start byte was ED.  This is fixed in Python 3.
+        """
+        FFFD = '\ufffd'
+        FFFDx2 = FFFD * 2
+        sequences = [
+            ('E0 00', FFFD+'\x00'), ('E0 7F', FFFD+'\x7f'), ('E0 80', FFFDx2),
+            ('E0 9F', FFFDx2), ('E0 C0', FFFDx2), ('E0 FF', FFFDx2),
+            ('E0 A0 00', FFFD+'\x00'), ('E0 A0 7F', FFFD+'\x7f'),
+            ('E0 A0 C0', FFFDx2), ('E0 A0 FF', FFFDx2),
+            ('E0 BF 00', FFFD+'\x00'), ('E0 BF 7F', FFFD+'\x7f'),
+            ('E0 BF C0', FFFDx2), ('E0 BF FF', FFFDx2), ('E1 00', FFFD+'\x00'),
+            ('E1 7F', FFFD+'\x7f'), ('E1 C0', FFFDx2), ('E1 FF', FFFDx2),
+            ('E1 80 00', FFFD+'\x00'), ('E1 80 7F', FFFD+'\x7f'),
+            ('E1 80 C0', FFFDx2), ('E1 80 FF', FFFDx2),
+            ('E1 BF 00', FFFD+'\x00'), ('E1 BF 7F', FFFD+'\x7f'),
+            ('E1 BF C0', FFFDx2), ('E1 BF FF', FFFDx2), ('EC 00', FFFD+'\x00'),
+            ('EC 7F', FFFD+'\x7f'), ('EC C0', FFFDx2), ('EC FF', FFFDx2),
+            ('EC 80 00', FFFD+'\x00'), ('EC 80 7F', FFFD+'\x7f'),
+            ('EC 80 C0', FFFDx2), ('EC 80 FF', FFFDx2),
+            ('EC BF 00', FFFD+'\x00'), ('EC BF 7F', FFFD+'\x7f'),
+            ('EC BF C0', FFFDx2), ('EC BF FF', FFFDx2), ('ED 00', FFFD+'\x00'),
+            ('ED 7F', FFFD+'\x7f'),
+            ('ED A0', FFFDx2), ('ED BF', FFFDx2), # see note ^
+            ('ED C0', FFFDx2), ('ED FF', FFFDx2), ('ED 80 00', FFFD+'\x00'),
+            ('ED 80 7F', FFFD+'\x7f'), ('ED 80 C0', FFFDx2),
+            ('ED 80 FF', FFFDx2), ('ED 9F 00', FFFD+'\x00'),
+            ('ED 9F 7F', FFFD+'\x7f'), ('ED 9F C0', FFFDx2),
+            ('ED 9F FF', FFFDx2), ('EE 00', FFFD+'\x00'),
+            ('EE 7F', FFFD+'\x7f'), ('EE C0', FFFDx2), ('EE FF', FFFDx2),
+            ('EE 80 00', FFFD+'\x00'), ('EE 80 7F', FFFD+'\x7f'),
+            ('EE 80 C0', FFFDx2), ('EE 80 FF', FFFDx2),
+            ('EE BF 00', FFFD+'\x00'), ('EE BF 7F', FFFD+'\x7f'),
+            ('EE BF C0', FFFDx2), ('EE BF FF', FFFDx2), ('EF 00', FFFD+'\x00'),
+            ('EF 7F', FFFD+'\x7f'), ('EF C0', FFFDx2), ('EF FF', FFFDx2),
+            ('EF 80 00', FFFD+'\x00'), ('EF 80 7F', FFFD+'\x7f'),
+            ('EF 80 C0', FFFDx2), ('EF 80 FF', FFFDx2),
+            ('EF BF 00', FFFD+'\x00'), ('EF BF 7F', FFFD+'\x7f'),
+            ('EF BF C0', FFFDx2), ('EF BF FF', FFFDx2),
+        ]
+        for seq, res in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), res,
+                                           'invalid continuation byte')
+
+    def test_invalid_cb_for_4bytes_seq(self):
+        """
+        Test that an 'invalid continuation byte' error is raised when the
+        continuation byte(s) of a 4-bytes sequence are invalid.  When
+        errors='replace',the start byte and all the following valid
+        continuation bytes are replaced with a single U+FFFD, and all the bytes
+        starting from the first invalid continuation bytes (included) are
+        handled separately.
+        E.g. in the sequence <E1 80 41>, E1 is the start byte of a 3-bytes
+        sequence, 80 is a valid continuation byte, but 41 is not a valid cb
+        because it's the ASCII letter 'A'.
+        Note: when the start byte is E0 or ED, the valid ranges for the first
+        continuation byte are limited to A0..BF and 80..9F respectively.
+        However, when the start byte is ED, Python 2 considers all the bytes
+        in range 80..BF valid.  This is fixed in Python 3.
+        """
+        FFFD = '\ufffd'
+        FFFDx2 = FFFD * 2
+        sequences = [
+            ('F0 00', FFFD+'\x00'), ('F0 7F', FFFD+'\x7f'), ('F0 80', FFFDx2),
+            ('F0 8F', FFFDx2), ('F0 C0', FFFDx2), ('F0 FF', FFFDx2),
+            ('F0 90 00', FFFD+'\x00'), ('F0 90 7F', FFFD+'\x7f'),
+            ('F0 90 C0', FFFDx2), ('F0 90 FF', FFFDx2),
+            ('F0 BF 00', FFFD+'\x00'), ('F0 BF 7F', FFFD+'\x7f'),
+            ('F0 BF C0', FFFDx2), ('F0 BF FF', FFFDx2),
+            ('F0 90 80 00', FFFD+'\x00'), ('F0 90 80 7F', FFFD+'\x7f'),
+            ('F0 90 80 C0', FFFDx2), ('F0 90 80 FF', FFFDx2),
+            ('F0 90 BF 00', FFFD+'\x00'), ('F0 90 BF 7F', FFFD+'\x7f'),
+            ('F0 90 BF C0', FFFDx2), ('F0 90 BF FF', FFFDx2),
+            ('F0 BF 80 00', FFFD+'\x00'), ('F0 BF 80 7F', FFFD+'\x7f'),
+            ('F0 BF 80 C0', FFFDx2), ('F0 BF 80 FF', FFFDx2),
+            ('F0 BF BF 00', FFFD+'\x00'), ('F0 BF BF 7F', FFFD+'\x7f'),
+            ('F0 BF BF C0', FFFDx2), ('F0 BF BF FF', FFFDx2),
+            ('F1 00', FFFD+'\x00'), ('F1 7F', FFFD+'\x7f'), ('F1 C0', FFFDx2),
+            ('F1 FF', FFFDx2), ('F1 80 00', FFFD+'\x00'),
+            ('F1 80 7F', FFFD+'\x7f'), ('F1 80 C0', FFFDx2),
+            ('F1 80 FF', FFFDx2), ('F1 BF 00', FFFD+'\x00'),
+            ('F1 BF 7F', FFFD+'\x7f'), ('F1 BF C0', FFFDx2),
+            ('F1 BF FF', FFFDx2), ('F1 80 80 00', FFFD+'\x00'),
+            ('F1 80 80 7F', FFFD+'\x7f'), ('F1 80 80 C0', FFFDx2),
+            ('F1 80 80 FF', FFFDx2), ('F1 80 BF 00', FFFD+'\x00'),
+            ('F1 80 BF 7F', FFFD+'\x7f'), ('F1 80 BF C0', FFFDx2),
+            ('F1 80 BF FF', FFFDx2), ('F1 BF 80 00', FFFD+'\x00'),
+            ('F1 BF 80 7F', FFFD+'\x7f'), ('F1 BF 80 C0', FFFDx2),
+            ('F1 BF 80 FF', FFFDx2), ('F1 BF BF 00', FFFD+'\x00'),
+            ('F1 BF BF 7F', FFFD+'\x7f'), ('F1 BF BF C0', FFFDx2),
+            ('F1 BF BF FF', FFFDx2), ('F3 00', FFFD+'\x00'),
+            ('F3 7F', FFFD+'\x7f'), ('F3 C0', FFFDx2), ('F3 FF', FFFDx2),
+            ('F3 80 00', FFFD+'\x00'), ('F3 80 7F', FFFD+'\x7f'),
+            ('F3 80 C0', FFFDx2), ('F3 80 FF', FFFDx2),
+            ('F3 BF 00', FFFD+'\x00'), ('F3 BF 7F', FFFD+'\x7f'),
+            ('F3 BF C0', FFFDx2), ('F3 BF FF', FFFDx2),
+            ('F3 80 80 00', FFFD+'\x00'), ('F3 80 80 7F', FFFD+'\x7f'),
+            ('F3 80 80 C0', FFFDx2), ('F3 80 80 FF', FFFDx2),
+            ('F3 80 BF 00', FFFD+'\x00'), ('F3 80 BF 7F', FFFD+'\x7f'),
+            ('F3 80 BF C0', FFFDx2), ('F3 80 BF FF', FFFDx2),
+            ('F3 BF 80 00', FFFD+'\x00'), ('F3 BF 80 7F', FFFD+'\x7f'),
+            ('F3 BF 80 C0', FFFDx2), ('F3 BF 80 FF', FFFDx2),
+            ('F3 BF BF 00', FFFD+'\x00'), ('F3 BF BF 7F', FFFD+'\x7f'),
+            ('F3 BF BF C0', FFFDx2), ('F3 BF BF FF', FFFDx2),
+            ('F4 00', FFFD+'\x00'), ('F4 7F', FFFD+'\x7f'), ('F4 90', FFFDx2),
+            ('F4 BF', FFFDx2), ('F4 C0', FFFDx2), ('F4 FF', FFFDx2),
+            ('F4 80 00', FFFD+'\x00'), ('F4 80 7F', FFFD+'\x7f'),
+            ('F4 80 C0', FFFDx2), ('F4 80 FF', FFFDx2),
+            ('F4 8F 00', FFFD+'\x00'), ('F4 8F 7F', FFFD+'\x7f'),
+            ('F4 8F C0', FFFDx2), ('F4 8F FF', FFFDx2),
+            ('F4 80 80 00', FFFD+'\x00'), ('F4 80 80 7F', FFFD+'\x7f'),
+            ('F4 80 80 C0', FFFDx2), ('F4 80 80 FF', FFFDx2),
+            ('F4 80 BF 00', FFFD+'\x00'), ('F4 80 BF 7F', FFFD+'\x7f'),
+            ('F4 80 BF C0', FFFDx2), ('F4 80 BF FF', FFFDx2),
+            ('F4 8F 80 00', FFFD+'\x00'), ('F4 8F 80 7F', FFFD+'\x7f'),
+            ('F4 8F 80 C0', FFFDx2), ('F4 8F 80 FF', FFFDx2),
+            ('F4 8F BF 00', FFFD+'\x00'), ('F4 8F BF 7F', FFFD+'\x7f'),
+            ('F4 8F BF C0', FFFDx2), ('F4 8F BF FF', FFFDx2)
+        ]
+        for seq, res in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), res,
+                                           'invalid continuation byte')
+
     def test_codecs_idna(self):
         # Test whether trailing dot is preserved
         self.assertEqual("www.python.org.".encode("idna"), b"www.python.org.")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@
 Core and Builtins
 -----------------
 
+- Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
+  characters when used with the 'replace' error handler on invalid utf-8
+  sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.
+
 - Issue #5765: Apply a hard recursion limit in the compiler instead of
   blowing the stack and segfaulting. Initial patch by Andrea Griffini.
 
@@ -33,7 +37,7 @@
 - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
   class's __dict__ and on type.
 
-- Issue #16197: Update winreg docstrings and documentation to match code.      
+- Issue #16197: Update winreg docstrings and documentation to match code.
   Patch by Zachary Ware.
 
 - Issue #16241: Document -X faulthandler command line option.
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -91,15 +91,14 @@
             }
         }
 
-        if (ch < 0xC2) {
-            /* invalid sequence
-               \x80-\xBF -- continuation byte
-               \xC0-\xC1 -- fake 0000-007F */
-            goto InvalidStart;
-        }
-
         if (ch < 0xE0) {
             /* \xC2\x80-\xDF\xBF -- 0080-07FF */
+            if (ch < 0xC2) {
+                /* invalid sequence
+                \x80-\xBF -- continuation byte
+                \xC0-\xC1 -- fake 0000-007F */
+                goto InvalidStart;
+            }
             Py_UCS4 ch2;
             if (end - s < 2) {
                 /* unexpected end of data: the caller will decide whether
@@ -109,14 +108,15 @@
             ch2 = (unsigned char)s[1];
             if (!IS_CONTINUATION_BYTE(ch2))
                 /* invalid continuation byte */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
             ch = (ch << 6) + ch2 -
                  ((0xC0 << 6) + 0x80);
             assert ((ch > 0x007F) && (ch <= 0x07FF));
             s += 2;
             if (STRINGLIB_MAX_CHAR <= 0x007F ||
                 (STRINGLIB_MAX_CHAR < 0x07FF && ch > STRINGLIB_MAX_CHAR))
-                goto Overflow;
+                /* Out-of-range */
+                goto Return;
             *p++ = ch;
             continue;
         }
@@ -127,28 +127,37 @@
             if (end - s < 3) {
                 /* unexpected end of data: the caller will decide whether
                    it's an error or not */
+                if (end - s < 2)
+                    break;
+                ch2 = (unsigned char)s[1];
+                if (!IS_CONTINUATION_BYTE(ch2) ||
+                    (ch2 < 0xA0 ? ch == 0xE0 : ch == 0xED))
+                    /* for clarification see comments below */
+                    goto InvalidContinuation1;
                 break;
             }
             ch2 = (unsigned char)s[1];
             ch3 = (unsigned char)s[2];
-            if (!IS_CONTINUATION_BYTE(ch2) ||
-                !IS_CONTINUATION_BYTE(ch3)) {
+            if (!IS_CONTINUATION_BYTE(ch2)) {
                 /* invalid continuation byte */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
             }
             if (ch == 0xE0) {
                 if (ch2 < 0xA0)
                     /* invalid sequence
                        \xE0\x80\x80-\xE0\x9F\xBF -- fake 0000-0800 */
-                    goto InvalidContinuation;
-            }
-            else if (ch == 0xED && ch2 > 0x9F) {
+                    goto InvalidContinuation1;
+            } else if (ch == 0xED && ch2 >= 0xA0) {
                 /* Decoding UTF-8 sequences in range \xED\xA0\x80-\xED\xBF\xBF
                    will result in surrogates in range D800-DFFF. Surrogates are
                    not valid UTF-8 so they are rejected.
                    See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
                    (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
+            }
+            if (!IS_CONTINUATION_BYTE(ch3)) {
+                /* invalid continuation byte */
+                goto InvalidContinuation2;
             }
             ch = (ch << 12) + (ch2 << 6) + ch3 -
                  ((0xE0 << 12) + (0x80 << 6) + 0x80);
@@ -156,7 +165,8 @@
             s += 3;
             if (STRINGLIB_MAX_CHAR <= 0x07FF ||
                 (STRINGLIB_MAX_CHAR < 0xFFFF && ch > STRINGLIB_MAX_CHAR))
-                goto Overflow;
+                /* Out-of-range */
+                goto Return;
             *p++ = ch;
             continue;
         }
@@ -167,27 +177,44 @@
             if (end - s < 4) {
                 /* unexpected end of data: the caller will decide whether
                    it's an error or not */
+                if (end - s < 2)
+                    break;
+                ch2 = (unsigned char)s[1];
+                if (!IS_CONTINUATION_BYTE(ch2) ||
+                    (ch2 < 0x90 ? ch == 0xF0 : ch == 0xF4))
+                    /* for clarification see comments below */
+                    goto InvalidContinuation1;
+                if (end - s < 3)
+                    break;
+                ch3 = (unsigned char)s[2];
+                if (!IS_CONTINUATION_BYTE(ch3))
+                    goto InvalidContinuation2;
                 break;
             }
             ch2 = (unsigned char)s[1];
             ch3 = (unsigned char)s[2];
             ch4 = (unsigned char)s[3];
-            if (!IS_CONTINUATION_BYTE(ch2) ||
-                !IS_CONTINUATION_BYTE(ch3) ||
-                !IS_CONTINUATION_BYTE(ch4)) {
+            if (!IS_CONTINUATION_BYTE(ch2)) {
                 /* invalid continuation byte */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
             }
             if (ch == 0xF0) {
                 if (ch2 < 0x90)
                     /* invalid sequence
-                       \xF0\x80\x80\x80-\xF0\x80\xBF\xBF -- fake 0000-FFFF */
-                    goto InvalidContinuation;
-            }
-            else if (ch == 0xF4 && ch2 > 0x8F) {
+                       \xF0\x80\x80\x80-\xF0\x8F\xBF\xBF -- fake 0000-FFFF */
+                    goto InvalidContinuation1;
+            } else if (ch == 0xF4 && ch2 >= 0x90) {
                 /* invalid sequence
                    \xF4\x90\x80\80- -- 110000- overflow */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
+            }
+            if (!IS_CONTINUATION_BYTE(ch3)) {
+                /* invalid continuation byte */
+                goto InvalidContinuation2;
+            }
+            if (!IS_CONTINUATION_BYTE(ch4)) {
+                /* invalid continuation byte */
+                goto InvalidContinuation3;
             }
             ch = (ch << 18) + (ch2 << 12) + (ch3 << 6) + ch4 -
                  ((0xF0 << 18) + (0x80 << 12) + (0x80 << 6) + 0x80);
@@ -195,14 +222,14 @@
             s += 4;
             if (STRINGLIB_MAX_CHAR <= 0xFFFF ||
                 (STRINGLIB_MAX_CHAR < 0x10FFFF && ch > STRINGLIB_MAX_CHAR))
-                goto Overflow;
+                /* Out-of-range */
+                goto Return;
             *p++ = ch;
             continue;
         }
         goto InvalidStart;
     }
     ch = 0;
-Overflow:
 Return:
     *inptr = s;
     *outpos = p - dest;
@@ -210,13 +237,18 @@
 InvalidStart:
     ch = 1;
     goto Return;
-InvalidContinuation:
+InvalidContinuation1:
     ch = 2;
     goto Return;
+InvalidContinuation2:
+    ch = 3;
+    goto Return;
+InvalidContinuation3:
+    ch = 4;
+    goto Return;
 }
 
 #undef ASCII_CHAR_MASK
-#undef IS_CONTINUATION_BYTE
 
 
 /* UTF-8 encoder specialized for a Unicode kind to avoid the slow
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4759,9 +4759,7 @@
                 goto End;
             errmsg = "unexpected end of data";
             startinpos = s - starts;
-            endinpos = startinpos + 1;
-            while (endinpos < size && (starts[endinpos] & 0xC0) == 0x80)
-                endinpos++;
+            endinpos = end - starts;
             break;
         case 1:
             errmsg = "invalid start byte";
@@ -4769,11 +4767,11 @@
             endinpos = startinpos + 1;
             break;
         case 2:
+        case 3:
+        case 4:
             errmsg = "invalid continuation byte";
             startinpos = s - starts;
-            endinpos = startinpos + 1;
-            while (endinpos < size && (starts[endinpos] & 0xC0) == 0x80)
-                endinpos++;
+            endinpos = startinpos + ch - 1;
             break;
         default:
             if (unicode_putchar(&unicode, &outpos, ch) < 0)

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

From python-checkins at python.org  Sun Nov  4 22:23:39 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 22:23:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzgyNzE6IG1lcmdlIHdpdGggMy4zLg==?=
Message-ID: <3Xvqkz2B4GzRKd@mail.python.org>

http://hg.python.org/cpython/rev/5b205fff1972
changeset:   80247:5b205fff1972
parent:      80245:fc8f1b1c76bf
parent:      80246:5962f192a483
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 04 23:23:09 2012 +0200
summary:
  #8271: merge with 3.3.

files:
  Lib/test/test_unicode.py   |  222 ++++++++++++++++++++++++-
  Misc/NEWS                  |    4 +
  Objects/stringlib/codecs.h |   92 ++++++---
  Objects/unicodeobject.c    |   10 +-
  4 files changed, 291 insertions(+), 37 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1349,7 +1349,7 @@
             # with start byte of a 2-byte sequence
             (b'\xc2', FFFD), # only the start byte
             (b'\xc2\xc2', FFFD*2), # 2 start bytes
-            (b'\xc2\xc2\xc2', FFFD*3), # 2 start bytes
+            (b'\xc2\xc2\xc2', FFFD*3), # 3 start bytes
             (b'\xc2\x41', FFFD+'A'), # invalid continuation byte
             # with start byte of a 3-byte sequence
             (b'\xe1', FFFD), # only the start byte
@@ -1419,6 +1419,226 @@
             self.assertEqual(seq.decode('utf-8', 'ignore'),
                              res.replace('\uFFFD', ''))
 
+    def to_bytestring(self, seq):
+        return bytes(int(c, 16) for c in seq.split())
+
+    def assertCorrectUTF8Decoding(self, seq, res, err):
+        """
+        Check that an invalid UTF-8 sequence raises an UnicodeDecodeError when
+        'strict' is used, returns res when 'replace' is used, and that doesn't
+        return anything when 'ignore' is used.
+        """
+        with self.assertRaises(UnicodeDecodeError) as cm:
+            seq.decode('utf-8')
+        exc = cm.exception
+
+        self.assertIn(err, str(exc))
+        self.assertEqual(seq.decode('utf-8', 'replace'), res)
+        self.assertEqual((b'aaaa' + seq + b'bbbb').decode('utf-8', 'replace'),
+                         'aaaa' + res + 'bbbb')
+        res = res.replace('\ufffd', '')
+        self.assertEqual(seq.decode('utf-8', 'ignore'), res)
+        self.assertEqual((b'aaaa' + seq + b'bbbb').decode('utf-8', 'ignore'),
+                          'aaaa' + res + 'bbbb')
+
+    def test_invalid_start_byte(self):
+        """
+        Test that an 'invalid start byte' error is raised when the first byte
+        is not in the ASCII range or is not a valid start byte of a 2-, 3-, or
+        4-bytes sequence. The invalid start byte is replaced with a single
+        U+FFFD when errors='replace'.
+        E.g. <80> is a continuation byte and can appear only after a start byte.
+        """
+        FFFD = '\ufffd'
+        for byte in b'\x80\xA0\x9F\xBF\xC0\xC1\xF5\xFF':
+            self.assertCorrectUTF8Decoding(bytes([byte]), '\ufffd',
+                                           'invalid start byte')
+
+    def test_unexpected_end_of_data(self):
+        """
+        Test that an 'unexpected end of data' error is raised when the string
+        ends after a start byte of a 2-, 3-, or 4-bytes sequence without having
+        enough continuation bytes.  The incomplete sequence is replaced with a
+        single U+FFFD when errors='replace'.
+        E.g. in the sequence <F3 80 80>, F3 is the start byte of a 4-bytes
+        sequence, but it's followed by only 2 valid continuation bytes and the
+        last continuation bytes is missing.
+        Note: the continuation bytes must be all valid, if one of them is
+        invalid another error will be raised.
+        """
+        sequences = [
+            'C2', 'DF',
+            'E0 A0', 'E0 BF', 'E1 80', 'E1 BF', 'EC 80', 'EC BF',
+            'ED 80', 'ED 9F', 'EE 80', 'EE BF', 'EF 80', 'EF BF',
+            'F0 90', 'F0 BF', 'F0 90 80', 'F0 90 BF', 'F0 BF 80', 'F0 BF BF',
+            'F1 80', 'F1 BF', 'F1 80 80', 'F1 80 BF', 'F1 BF 80', 'F1 BF BF',
+            'F3 80', 'F3 BF', 'F3 80 80', 'F3 80 BF', 'F3 BF 80', 'F3 BF BF',
+            'F4 80', 'F4 8F', 'F4 80 80', 'F4 80 BF', 'F4 8F 80', 'F4 8F BF'
+        ]
+        FFFD = '\ufffd'
+        for seq in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), '\ufffd',
+                                           'unexpected end of data')
+
+    def test_invalid_cb_for_2bytes_seq(self):
+        """
+        Test that an 'invalid continuation byte' error is raised when the
+        continuation byte of a 2-bytes sequence is invalid.  The start byte
+        is replaced by a single U+FFFD and the second byte is handled
+        separately when errors='replace'.
+        E.g. in the sequence <C2 41>, C2 is the start byte of a 2-bytes
+        sequence, but 41 is not a valid continuation byte because it's the
+        ASCII letter 'A'.
+        """
+        FFFD = '\ufffd'
+        FFFDx2 = FFFD * 2
+        sequences = [
+            ('C2 00', FFFD+'\x00'), ('C2 7F', FFFD+'\x7f'),
+            ('C2 C0', FFFDx2), ('C2 FF', FFFDx2),
+            ('DF 00', FFFD+'\x00'), ('DF 7F', FFFD+'\x7f'),
+            ('DF C0', FFFDx2), ('DF FF', FFFDx2),
+        ]
+        for seq, res in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), res,
+                                           'invalid continuation byte')
+
+    def test_invalid_cb_for_3bytes_seq(self):
+        """
+        Test that an 'invalid continuation byte' error is raised when the
+        continuation byte(s) of a 3-bytes sequence are invalid.  When
+        errors='replace', if the first continuation byte is valid, the first
+        two bytes (start byte + 1st cb) are replaced by a single U+FFFD and the
+        third byte is handled separately, otherwise only the start byte is
+        replaced with a U+FFFD and the other continuation bytes are handled
+        separately.
+        E.g. in the sequence <E1 80 41>, E1 is the start byte of a 3-bytes
+        sequence, 80 is a valid continuation byte, but 41 is not a valid cb
+        because it's the ASCII letter 'A'.
+        Note: when the start byte is E0 or ED, the valid ranges for the first
+        continuation byte are limited to A0..BF and 80..9F respectively.
+        Python 2 used to consider all the bytes in range 80..BF valid when the
+        start byte was ED.  This is fixed in Python 3.
+        """
+        FFFD = '\ufffd'
+        FFFDx2 = FFFD * 2
+        sequences = [
+            ('E0 00', FFFD+'\x00'), ('E0 7F', FFFD+'\x7f'), ('E0 80', FFFDx2),
+            ('E0 9F', FFFDx2), ('E0 C0', FFFDx2), ('E0 FF', FFFDx2),
+            ('E0 A0 00', FFFD+'\x00'), ('E0 A0 7F', FFFD+'\x7f'),
+            ('E0 A0 C0', FFFDx2), ('E0 A0 FF', FFFDx2),
+            ('E0 BF 00', FFFD+'\x00'), ('E0 BF 7F', FFFD+'\x7f'),
+            ('E0 BF C0', FFFDx2), ('E0 BF FF', FFFDx2), ('E1 00', FFFD+'\x00'),
+            ('E1 7F', FFFD+'\x7f'), ('E1 C0', FFFDx2), ('E1 FF', FFFDx2),
+            ('E1 80 00', FFFD+'\x00'), ('E1 80 7F', FFFD+'\x7f'),
+            ('E1 80 C0', FFFDx2), ('E1 80 FF', FFFDx2),
+            ('E1 BF 00', FFFD+'\x00'), ('E1 BF 7F', FFFD+'\x7f'),
+            ('E1 BF C0', FFFDx2), ('E1 BF FF', FFFDx2), ('EC 00', FFFD+'\x00'),
+            ('EC 7F', FFFD+'\x7f'), ('EC C0', FFFDx2), ('EC FF', FFFDx2),
+            ('EC 80 00', FFFD+'\x00'), ('EC 80 7F', FFFD+'\x7f'),
+            ('EC 80 C0', FFFDx2), ('EC 80 FF', FFFDx2),
+            ('EC BF 00', FFFD+'\x00'), ('EC BF 7F', FFFD+'\x7f'),
+            ('EC BF C0', FFFDx2), ('EC BF FF', FFFDx2), ('ED 00', FFFD+'\x00'),
+            ('ED 7F', FFFD+'\x7f'),
+            ('ED A0', FFFDx2), ('ED BF', FFFDx2), # see note ^
+            ('ED C0', FFFDx2), ('ED FF', FFFDx2), ('ED 80 00', FFFD+'\x00'),
+            ('ED 80 7F', FFFD+'\x7f'), ('ED 80 C0', FFFDx2),
+            ('ED 80 FF', FFFDx2), ('ED 9F 00', FFFD+'\x00'),
+            ('ED 9F 7F', FFFD+'\x7f'), ('ED 9F C0', FFFDx2),
+            ('ED 9F FF', FFFDx2), ('EE 00', FFFD+'\x00'),
+            ('EE 7F', FFFD+'\x7f'), ('EE C0', FFFDx2), ('EE FF', FFFDx2),
+            ('EE 80 00', FFFD+'\x00'), ('EE 80 7F', FFFD+'\x7f'),
+            ('EE 80 C0', FFFDx2), ('EE 80 FF', FFFDx2),
+            ('EE BF 00', FFFD+'\x00'), ('EE BF 7F', FFFD+'\x7f'),
+            ('EE BF C0', FFFDx2), ('EE BF FF', FFFDx2), ('EF 00', FFFD+'\x00'),
+            ('EF 7F', FFFD+'\x7f'), ('EF C0', FFFDx2), ('EF FF', FFFDx2),
+            ('EF 80 00', FFFD+'\x00'), ('EF 80 7F', FFFD+'\x7f'),
+            ('EF 80 C0', FFFDx2), ('EF 80 FF', FFFDx2),
+            ('EF BF 00', FFFD+'\x00'), ('EF BF 7F', FFFD+'\x7f'),
+            ('EF BF C0', FFFDx2), ('EF BF FF', FFFDx2),
+        ]
+        for seq, res in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), res,
+                                           'invalid continuation byte')
+
+    def test_invalid_cb_for_4bytes_seq(self):
+        """
+        Test that an 'invalid continuation byte' error is raised when the
+        continuation byte(s) of a 4-bytes sequence are invalid.  When
+        errors='replace',the start byte and all the following valid
+        continuation bytes are replaced with a single U+FFFD, and all the bytes
+        starting from the first invalid continuation bytes (included) are
+        handled separately.
+        E.g. in the sequence <E1 80 41>, E1 is the start byte of a 3-bytes
+        sequence, 80 is a valid continuation byte, but 41 is not a valid cb
+        because it's the ASCII letter 'A'.
+        Note: when the start byte is E0 or ED, the valid ranges for the first
+        continuation byte are limited to A0..BF and 80..9F respectively.
+        However, when the start byte is ED, Python 2 considers all the bytes
+        in range 80..BF valid.  This is fixed in Python 3.
+        """
+        FFFD = '\ufffd'
+        FFFDx2 = FFFD * 2
+        sequences = [
+            ('F0 00', FFFD+'\x00'), ('F0 7F', FFFD+'\x7f'), ('F0 80', FFFDx2),
+            ('F0 8F', FFFDx2), ('F0 C0', FFFDx2), ('F0 FF', FFFDx2),
+            ('F0 90 00', FFFD+'\x00'), ('F0 90 7F', FFFD+'\x7f'),
+            ('F0 90 C0', FFFDx2), ('F0 90 FF', FFFDx2),
+            ('F0 BF 00', FFFD+'\x00'), ('F0 BF 7F', FFFD+'\x7f'),
+            ('F0 BF C0', FFFDx2), ('F0 BF FF', FFFDx2),
+            ('F0 90 80 00', FFFD+'\x00'), ('F0 90 80 7F', FFFD+'\x7f'),
+            ('F0 90 80 C0', FFFDx2), ('F0 90 80 FF', FFFDx2),
+            ('F0 90 BF 00', FFFD+'\x00'), ('F0 90 BF 7F', FFFD+'\x7f'),
+            ('F0 90 BF C0', FFFDx2), ('F0 90 BF FF', FFFDx2),
+            ('F0 BF 80 00', FFFD+'\x00'), ('F0 BF 80 7F', FFFD+'\x7f'),
+            ('F0 BF 80 C0', FFFDx2), ('F0 BF 80 FF', FFFDx2),
+            ('F0 BF BF 00', FFFD+'\x00'), ('F0 BF BF 7F', FFFD+'\x7f'),
+            ('F0 BF BF C0', FFFDx2), ('F0 BF BF FF', FFFDx2),
+            ('F1 00', FFFD+'\x00'), ('F1 7F', FFFD+'\x7f'), ('F1 C0', FFFDx2),
+            ('F1 FF', FFFDx2), ('F1 80 00', FFFD+'\x00'),
+            ('F1 80 7F', FFFD+'\x7f'), ('F1 80 C0', FFFDx2),
+            ('F1 80 FF', FFFDx2), ('F1 BF 00', FFFD+'\x00'),
+            ('F1 BF 7F', FFFD+'\x7f'), ('F1 BF C0', FFFDx2),
+            ('F1 BF FF', FFFDx2), ('F1 80 80 00', FFFD+'\x00'),
+            ('F1 80 80 7F', FFFD+'\x7f'), ('F1 80 80 C0', FFFDx2),
+            ('F1 80 80 FF', FFFDx2), ('F1 80 BF 00', FFFD+'\x00'),
+            ('F1 80 BF 7F', FFFD+'\x7f'), ('F1 80 BF C0', FFFDx2),
+            ('F1 80 BF FF', FFFDx2), ('F1 BF 80 00', FFFD+'\x00'),
+            ('F1 BF 80 7F', FFFD+'\x7f'), ('F1 BF 80 C0', FFFDx2),
+            ('F1 BF 80 FF', FFFDx2), ('F1 BF BF 00', FFFD+'\x00'),
+            ('F1 BF BF 7F', FFFD+'\x7f'), ('F1 BF BF C0', FFFDx2),
+            ('F1 BF BF FF', FFFDx2), ('F3 00', FFFD+'\x00'),
+            ('F3 7F', FFFD+'\x7f'), ('F3 C0', FFFDx2), ('F3 FF', FFFDx2),
+            ('F3 80 00', FFFD+'\x00'), ('F3 80 7F', FFFD+'\x7f'),
+            ('F3 80 C0', FFFDx2), ('F3 80 FF', FFFDx2),
+            ('F3 BF 00', FFFD+'\x00'), ('F3 BF 7F', FFFD+'\x7f'),
+            ('F3 BF C0', FFFDx2), ('F3 BF FF', FFFDx2),
+            ('F3 80 80 00', FFFD+'\x00'), ('F3 80 80 7F', FFFD+'\x7f'),
+            ('F3 80 80 C0', FFFDx2), ('F3 80 80 FF', FFFDx2),
+            ('F3 80 BF 00', FFFD+'\x00'), ('F3 80 BF 7F', FFFD+'\x7f'),
+            ('F3 80 BF C0', FFFDx2), ('F3 80 BF FF', FFFDx2),
+            ('F3 BF 80 00', FFFD+'\x00'), ('F3 BF 80 7F', FFFD+'\x7f'),
+            ('F3 BF 80 C0', FFFDx2), ('F3 BF 80 FF', FFFDx2),
+            ('F3 BF BF 00', FFFD+'\x00'), ('F3 BF BF 7F', FFFD+'\x7f'),
+            ('F3 BF BF C0', FFFDx2), ('F3 BF BF FF', FFFDx2),
+            ('F4 00', FFFD+'\x00'), ('F4 7F', FFFD+'\x7f'), ('F4 90', FFFDx2),
+            ('F4 BF', FFFDx2), ('F4 C0', FFFDx2), ('F4 FF', FFFDx2),
+            ('F4 80 00', FFFD+'\x00'), ('F4 80 7F', FFFD+'\x7f'),
+            ('F4 80 C0', FFFDx2), ('F4 80 FF', FFFDx2),
+            ('F4 8F 00', FFFD+'\x00'), ('F4 8F 7F', FFFD+'\x7f'),
+            ('F4 8F C0', FFFDx2), ('F4 8F FF', FFFDx2),
+            ('F4 80 80 00', FFFD+'\x00'), ('F4 80 80 7F', FFFD+'\x7f'),
+            ('F4 80 80 C0', FFFDx2), ('F4 80 80 FF', FFFDx2),
+            ('F4 80 BF 00', FFFD+'\x00'), ('F4 80 BF 7F', FFFD+'\x7f'),
+            ('F4 80 BF C0', FFFDx2), ('F4 80 BF FF', FFFDx2),
+            ('F4 8F 80 00', FFFD+'\x00'), ('F4 8F 80 7F', FFFD+'\x7f'),
+            ('F4 8F 80 C0', FFFDx2), ('F4 8F 80 FF', FFFDx2),
+            ('F4 8F BF 00', FFFD+'\x00'), ('F4 8F BF 7F', FFFD+'\x7f'),
+            ('F4 8F BF C0', FFFDx2), ('F4 8F BF FF', FFFDx2)
+        ]
+        for seq, res in sequences:
+            self.assertCorrectUTF8Decoding(self.to_bytestring(seq), res,
+                                           'invalid continuation byte')
+
     def test_codecs_idna(self):
         # Test whether trailing dot is preserved
         self.assertEqual("www.python.org.".encode("idna"), b"www.python.org.")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
+  characters when used with the 'replace' error handler on invalid utf-8
+  sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.
+
 - Issue #5765: Apply a hard recursion limit in the compiler instead of
   blowing the stack and segfaulting. Initial patch by Andrea Griffini.
 
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -91,15 +91,14 @@
             }
         }
 
-        if (ch < 0xC2) {
-            /* invalid sequence
-               \x80-\xBF -- continuation byte
-               \xC0-\xC1 -- fake 0000-007F */
-            goto InvalidStart;
-        }
-
         if (ch < 0xE0) {
             /* \xC2\x80-\xDF\xBF -- 0080-07FF */
+            if (ch < 0xC2) {
+                /* invalid sequence
+                \x80-\xBF -- continuation byte
+                \xC0-\xC1 -- fake 0000-007F */
+                goto InvalidStart;
+            }
             Py_UCS4 ch2;
             if (end - s < 2) {
                 /* unexpected end of data: the caller will decide whether
@@ -109,14 +108,15 @@
             ch2 = (unsigned char)s[1];
             if (!IS_CONTINUATION_BYTE(ch2))
                 /* invalid continuation byte */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
             ch = (ch << 6) + ch2 -
                  ((0xC0 << 6) + 0x80);
             assert ((ch > 0x007F) && (ch <= 0x07FF));
             s += 2;
             if (STRINGLIB_MAX_CHAR <= 0x007F ||
                 (STRINGLIB_MAX_CHAR < 0x07FF && ch > STRINGLIB_MAX_CHAR))
-                goto Overflow;
+                /* Out-of-range */
+                goto Return;
             *p++ = ch;
             continue;
         }
@@ -127,28 +127,37 @@
             if (end - s < 3) {
                 /* unexpected end of data: the caller will decide whether
                    it's an error or not */
+                if (end - s < 2)
+                    break;
+                ch2 = (unsigned char)s[1];
+                if (!IS_CONTINUATION_BYTE(ch2) ||
+                    (ch2 < 0xA0 ? ch == 0xE0 : ch == 0xED))
+                    /* for clarification see comments below */
+                    goto InvalidContinuation1;
                 break;
             }
             ch2 = (unsigned char)s[1];
             ch3 = (unsigned char)s[2];
-            if (!IS_CONTINUATION_BYTE(ch2) ||
-                !IS_CONTINUATION_BYTE(ch3)) {
+            if (!IS_CONTINUATION_BYTE(ch2)) {
                 /* invalid continuation byte */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
             }
             if (ch == 0xE0) {
                 if (ch2 < 0xA0)
                     /* invalid sequence
                        \xE0\x80\x80-\xE0\x9F\xBF -- fake 0000-0800 */
-                    goto InvalidContinuation;
-            }
-            else if (ch == 0xED && ch2 > 0x9F) {
+                    goto InvalidContinuation1;
+            } else if (ch == 0xED && ch2 >= 0xA0) {
                 /* Decoding UTF-8 sequences in range \xED\xA0\x80-\xED\xBF\xBF
                    will result in surrogates in range D800-DFFF. Surrogates are
                    not valid UTF-8 so they are rejected.
                    See http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf
                    (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
+            }
+            if (!IS_CONTINUATION_BYTE(ch3)) {
+                /* invalid continuation byte */
+                goto InvalidContinuation2;
             }
             ch = (ch << 12) + (ch2 << 6) + ch3 -
                  ((0xE0 << 12) + (0x80 << 6) + 0x80);
@@ -156,7 +165,8 @@
             s += 3;
             if (STRINGLIB_MAX_CHAR <= 0x07FF ||
                 (STRINGLIB_MAX_CHAR < 0xFFFF && ch > STRINGLIB_MAX_CHAR))
-                goto Overflow;
+                /* Out-of-range */
+                goto Return;
             *p++ = ch;
             continue;
         }
@@ -167,27 +177,44 @@
             if (end - s < 4) {
                 /* unexpected end of data: the caller will decide whether
                    it's an error or not */
+                if (end - s < 2)
+                    break;
+                ch2 = (unsigned char)s[1];
+                if (!IS_CONTINUATION_BYTE(ch2) ||
+                    (ch2 < 0x90 ? ch == 0xF0 : ch == 0xF4))
+                    /* for clarification see comments below */
+                    goto InvalidContinuation1;
+                if (end - s < 3)
+                    break;
+                ch3 = (unsigned char)s[2];
+                if (!IS_CONTINUATION_BYTE(ch3))
+                    goto InvalidContinuation2;
                 break;
             }
             ch2 = (unsigned char)s[1];
             ch3 = (unsigned char)s[2];
             ch4 = (unsigned char)s[3];
-            if (!IS_CONTINUATION_BYTE(ch2) ||
-                !IS_CONTINUATION_BYTE(ch3) ||
-                !IS_CONTINUATION_BYTE(ch4)) {
+            if (!IS_CONTINUATION_BYTE(ch2)) {
                 /* invalid continuation byte */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
             }
             if (ch == 0xF0) {
                 if (ch2 < 0x90)
                     /* invalid sequence
-                       \xF0\x80\x80\x80-\xF0\x80\xBF\xBF -- fake 0000-FFFF */
-                    goto InvalidContinuation;
-            }
-            else if (ch == 0xF4 && ch2 > 0x8F) {
+                       \xF0\x80\x80\x80-\xF0\x8F\xBF\xBF -- fake 0000-FFFF */
+                    goto InvalidContinuation1;
+            } else if (ch == 0xF4 && ch2 >= 0x90) {
                 /* invalid sequence
                    \xF4\x90\x80\80- -- 110000- overflow */
-                goto InvalidContinuation;
+                goto InvalidContinuation1;
+            }
+            if (!IS_CONTINUATION_BYTE(ch3)) {
+                /* invalid continuation byte */
+                goto InvalidContinuation2;
+            }
+            if (!IS_CONTINUATION_BYTE(ch4)) {
+                /* invalid continuation byte */
+                goto InvalidContinuation3;
             }
             ch = (ch << 18) + (ch2 << 12) + (ch3 << 6) + ch4 -
                  ((0xF0 << 18) + (0x80 << 12) + (0x80 << 6) + 0x80);
@@ -195,14 +222,14 @@
             s += 4;
             if (STRINGLIB_MAX_CHAR <= 0xFFFF ||
                 (STRINGLIB_MAX_CHAR < 0x10FFFF && ch > STRINGLIB_MAX_CHAR))
-                goto Overflow;
+                /* Out-of-range */
+                goto Return;
             *p++ = ch;
             continue;
         }
         goto InvalidStart;
     }
     ch = 0;
-Overflow:
 Return:
     *inptr = s;
     *outpos = p - dest;
@@ -210,13 +237,18 @@
 InvalidStart:
     ch = 1;
     goto Return;
-InvalidContinuation:
+InvalidContinuation1:
     ch = 2;
     goto Return;
+InvalidContinuation2:
+    ch = 3;
+    goto Return;
+InvalidContinuation3:
+    ch = 4;
+    goto Return;
 }
 
 #undef ASCII_CHAR_MASK
-#undef IS_CONTINUATION_BYTE
 
 
 /* UTF-8 encoder specialized for a Unicode kind to avoid the slow
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4611,9 +4611,7 @@
                 goto End;
             errmsg = "unexpected end of data";
             startinpos = s - starts;
-            endinpos = startinpos + 1;
-            while (endinpos < size && (starts[endinpos] & 0xC0) == 0x80)
-                endinpos++;
+            endinpos = end - starts;
             break;
         case 1:
             errmsg = "invalid start byte";
@@ -4621,11 +4619,11 @@
             endinpos = startinpos + 1;
             break;
         case 2:
+        case 3:
+        case 4:
             errmsg = "invalid continuation byte";
             startinpos = s - starts;
-            endinpos = startinpos + 1;
-            while (endinpos < size && (starts[endinpos] & 0xC0) == 0x80)
-                endinpos++;
+            endinpos = startinpos + ch - 1;
             break;
         default:
             if (unicode_putchar(&unicode, &outpos, ch) < 0)

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

From python-checkins at python.org  Sun Nov  4 23:15:08 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 23:15:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzUwNTc6IHRoZSBw?=
 =?utf-8?q?eepholer_no_longer_optimizes_subscription_on_unicode_literals_?=
 =?utf-8?b?KGUuZy4=?=
Message-ID: <3XvrtN26TfzRD3@mail.python.org>

http://hg.python.org/cpython/rev/9481e062fe26
changeset:   80248:9481e062fe26
branch:      2.7
parent:      80232:dc96df8556d8
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 00:03:21 2012 +0200
summary:
  #5057: the peepholer no longer optimizes subscription on unicode literals (e.g. u"foo"[0]) in order to produce compatible pyc files between narrow and wide builds.

files:
  Lib/test/test_peepholer.py |  13 ++++++-----
  Misc/NEWS                  |   4 +++
  Python/peephole.c          |  27 ++++++-------------------
  3 files changed, 18 insertions(+), 26 deletions(-)


diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -138,21 +138,22 @@
         self.assertIn('(1000)', asm)
 
     def test_binary_subscr_on_unicode(self):
-        # valid code get optimized
+        # unicode strings don't get optimized
         asm = dis_single('u"foo"[0]')
-        self.assertIn("(u'f')", asm)
-        self.assertNotIn('BINARY_SUBSCR', asm)
+        self.assertNotIn("(u'f')", asm)
+        self.assertIn('BINARY_SUBSCR', asm)
         asm = dis_single('u"\u0061\uffff"[1]')
-        self.assertIn("(u'\\uffff')", asm)
-        self.assertNotIn('BINARY_SUBSCR', asm)
+        self.assertNotIn("(u'\\uffff')", asm)
+        self.assertIn('BINARY_SUBSCR', asm)
 
-        # invalid code doesn't get optimized
         # out of range
         asm = dis_single('u"fuu"[10]')
         self.assertIn('BINARY_SUBSCR', asm)
         # non-BMP char (see #5057)
         asm = dis_single('u"\U00012345"[0]')
         self.assertIn('BINARY_SUBSCR', asm)
+        asm = dis_single('u"\U00012345abcdef"[3]')
+        self.assertIn('BINARY_SUBSCR', asm)
 
 
     def test_folding_of_unaryops_on_constants(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,10 @@
 Core and Builtins
 -----------------
 
+- Issue #5057: the peepholer no longer optimize subscription on unicode
+  literals (e.g. u'foo'[0]) in order to produce compatible pyc files between
+  narrow and wide builds.
+
 - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now
   raises an error.
 
diff --git a/Python/peephole.c b/Python/peephole.c
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -128,27 +128,14 @@
             newconst = PyNumber_Subtract(v, w);
             break;
         case BINARY_SUBSCR:
+            /* #5057: if v is unicode, there might be differences between
+               wide and narrow builds in cases like '\U00012345'[0] or
+               '\U00012345abcdef'[3], so it's better to skip the optimization
+               in order to produce compatible pycs.
+            */
+            if (PyUnicode_Check(v))
+                return 0;
             newconst = PyObject_GetItem(v, w);
-            /* #5057: if v is unicode, there might be differences between
-               wide and narrow builds in cases like u'\U00012345'[0].
-               Wide builds will return a non-BMP char, whereas narrow builds
-               will return a surrogate.  In both the cases skip the
-               optimization in order to produce compatible pycs.
-             */
-#ifdef Py_USING_UNICODE
-            if (newconst != NULL &&
-                PyUnicode_Check(v) && PyUnicode_Check(newconst)) {
-                Py_UNICODE ch = PyUnicode_AS_UNICODE(newconst)[0];
-#ifdef Py_UNICODE_WIDE
-                if (ch > 0xFFFF) {
-#else
-                if (ch >= 0xD800 && ch <= 0xDFFF) {
-#endif
-                    Py_DECREF(newconst);
-                    return 0;
-                }
-            }
-#endif
             break;
         case BINARY_LSHIFT:
             newconst = PyNumber_Lshift(v, w);

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

From python-checkins at python.org  Sun Nov  4 23:15:09 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 23:15:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzUwNTc6IHRoZSBw?=
 =?utf-8?q?eepholer_no_longer_optimizes_subscription_on_unicode_literals_?=
 =?utf-8?b?KGUuZy4=?=
Message-ID: <3XvrtP4vHRzRGJ@mail.python.org>

http://hg.python.org/cpython/rev/56bc323288d1
changeset:   80249:56bc323288d1
branch:      3.2
parent:      80236:94d15358ad6e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 00:06:32 2012 +0200
summary:
  #5057: the peepholer no longer optimizes subscription on unicode literals (e.g. u"foo"[0]) in order to produce compatible pyc files between narrow and wide builds.

files:
  Lib/test/test_peepholer.py |  13 +++++++------
  Misc/NEWS                  |   4 ++++
  Python/peephole.c          |  25 +++++++------------------
  3 files changed, 18 insertions(+), 24 deletions(-)


diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -196,21 +196,22 @@
         self.assertIn('(1000)', asm)
 
     def test_binary_subscr_on_unicode(self):
-        # valid code get optimized
+        # unicode strings don't get optimized
         asm = dis_single('"foo"[0]')
-        self.assertIn("('f')", asm)
-        self.assertNotIn('BINARY_SUBSCR', asm)
+        self.assertNotIn("('f')", asm)
+        self.assertIn('BINARY_SUBSCR', asm)
         asm = dis_single('"\u0061\uffff"[1]')
-        self.assertIn("('\\uffff')", asm)
-        self.assertNotIn('BINARY_SUBSCR', asm)
+        self.assertNotIn("('\\uffff')", asm)
+        self.assertIn('BINARY_SUBSCR', asm)
 
-        # invalid code doesn't get optimized
         # out of range
         asm = dis_single('"fuu"[10]')
         self.assertIn('BINARY_SUBSCR', asm)
         # non-BMP char (see #5057)
         asm = dis_single('"\U00012345"[0]')
         self.assertIn('BINARY_SUBSCR', asm)
+        asm = dis_single('"\U00012345abcdef"[3]')
+        self.assertIn('BINARY_SUBSCR', asm)
 
 
     def test_folding_of_unaryops_on_constants(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #5057: the peepholer no longer optimizes subscription on unicode
+  literals (e.g. u'foo'[0]) in order to produce compatible pyc files between
+  narrow and wide builds.
+
 - Issue #16402: When slicing a range, fix shadowing of exceptions from
   __index__.
 
diff --git a/Python/peephole.c b/Python/peephole.c
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -132,25 +132,14 @@
             newconst = PyNumber_Subtract(v, w);
             break;
         case BINARY_SUBSCR:
+            /* #5057: if v is unicode, there might be differences between
+               wide and narrow builds in cases like '\U00012345'[0] or
+               '\U00012345abcdef'[3], so it's better to skip the optimization
+               in order to produce compatible pycs.
+            */
+            if (PyUnicode_Check(v))
+                return 0;
             newconst = PyObject_GetItem(v, w);
-            /* #5057: if v is unicode, there might be differences between
-               wide and narrow builds in cases like '\U00012345'[0].
-               Wide builds will return a non-BMP char, whereas narrow builds
-               will return a surrogate.  In both the cases skip the
-               optimization in order to produce compatible pycs.
-             */
-            if (newconst != NULL &&
-                PyUnicode_Check(v) && PyUnicode_Check(newconst)) {
-                Py_UNICODE ch = PyUnicode_AS_UNICODE(newconst)[0];
-#ifdef Py_UNICODE_WIDE
-                if (ch > 0xFFFF) {
-#else
-                if (ch >= 0xD800 && ch <= 0xDFFF) {
-#endif
-                    Py_DECREF(newconst);
-                    return 0;
-                }
-            }
             break;
         case BINARY_LSHIFT:
             newconst = PyNumber_Lshift(v, w);

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

From python-checkins at python.org  Sun Nov  4 23:15:10 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 23:15:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRml4IHR5cG8u?=
Message-ID: <3XvrtQ753rzRH2@mail.python.org>

http://hg.python.org/cpython/rev/daa1a7a51319
changeset:   80250:daa1a7a51319
branch:      2.7
parent:      80248:9481e062fe26
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 00:06:50 2012 +0200
summary:
  Fix typo.

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
@@ -9,7 +9,7 @@
 Core and Builtins
 -----------------
 
-- Issue #5057: the peepholer no longer optimize subscription on unicode
+- Issue #5057: the peepholer no longer optimizes subscription on unicode
   literals (e.g. u'foo'[0]) in order to produce compatible pyc files between
   narrow and wide builds.
 

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

From python-checkins at python.org  Sun Nov  4 23:15:12 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 23:15:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=235057=3A_null_merge_with_3=2E2_=28only_add_tests=29=2E?=
Message-ID: <3XvrtS2BTZzRJ5@mail.python.org>

http://hg.python.org/cpython/rev/3b4f2f9272b4
changeset:   80251:3b4f2f9272b4
branch:      3.3
parent:      80246:5962f192a483
parent:      80249:56bc323288d1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 00:13:57 2012 +0200
summary:
  #5057: null merge with 3.2 (only add tests).

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


diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -213,6 +213,9 @@
         asm = dis_single('"\u0061\uffff"[1]')
         self.assertIn("('\\uffff')", asm)
         self.assertNotIn('BINARY_SUBSCR', asm)
+        asm = dis_single('"\U00012345abcdef"[3]')
+        self.assertIn("('c')", asm)
+        self.assertNotIn('BINARY_SUBSCR', asm)
 
         # invalid code doesn't get optimized
         # out of range

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

From python-checkins at python.org  Sun Nov  4 23:15:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun,  4 Nov 2012 23:15:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_=235057=3A_null_merge_with_3=2E3_=28only_add_tests=29=2E?=
Message-ID: <3XvrtT4V0czRJH@mail.python.org>

http://hg.python.org/cpython/rev/0790c16bb275
changeset:   80252:0790c16bb275
parent:      80247:5b205fff1972
parent:      80251:3b4f2f9272b4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 00:14:34 2012 +0200
summary:
  #5057: null merge with 3.3 (only add tests).

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


diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -213,6 +213,9 @@
         asm = dis_single('"\u0061\uffff"[1]')
         self.assertIn("('\\uffff')", asm)
         self.assertNotIn('BINARY_SUBSCR', asm)
+        asm = dis_single('"\U00012345abcdef"[3]')
+        self.assertIn("('c')", asm)
+        self.assertNotIn('BINARY_SUBSCR', asm)
 
         # invalid code doesn't get optimized
         # out of range

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

From python-checkins at python.org  Mon Nov  5 00:00:40 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon,  5 Nov 2012 00:00:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzgyNzE6?=
 =?utf-8?q?_Fix_compilation_on_Windows?=
Message-ID: <3Xvstw2D7lzRFR@mail.python.org>

http://hg.python.org/cpython/rev/96f4cee8ea5e
changeset:   80253:96f4cee8ea5e
branch:      3.3
parent:      80251:3b4f2f9272b4
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Nov 04 23:59:15 2012 +0100
summary:
  Issue #8271: Fix compilation on Windows

files:
  Objects/stringlib/codecs.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -93,13 +93,13 @@
 
         if (ch < 0xE0) {
             /* \xC2\x80-\xDF\xBF -- 0080-07FF */
+            Py_UCS4 ch2;
             if (ch < 0xC2) {
                 /* invalid sequence
                 \x80-\xBF -- continuation byte
                 \xC0-\xC1 -- fake 0000-007F */
                 goto InvalidStart;
             }
-            Py_UCS4 ch2;
             if (end - s < 2) {
                 /* unexpected end of data: the caller will decide whether
                    it's an error or not */

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

From python-checkins at python.org  Mon Nov  5 00:00:41 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon,  5 Nov 2012 00:00:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_=28Merge_3=2E3=29_Issue_=238271=3A_Fix_compilation_on_Wi?=
 =?utf-8?q?ndows?=
Message-ID: <3Xvstx4MR2zRGC@mail.python.org>

http://hg.python.org/cpython/rev/6f44f33460cd
changeset:   80254:6f44f33460cd
parent:      80252:0790c16bb275
parent:      80253:96f4cee8ea5e
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 05 00:00:50 2012 +0100
summary:
  (Merge 3.3) Issue #8271: Fix compilation on Windows

files:
  Objects/stringlib/codecs.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -93,13 +93,13 @@
 
         if (ch < 0xE0) {
             /* \xC2\x80-\xDF\xBF -- 0080-07FF */
+            Py_UCS4 ch2;
             if (ch < 0xC2) {
                 /* invalid sequence
                 \x80-\xBF -- continuation byte
                 \xC0-\xC1 -- fake 0000-007F */
                 goto InvalidStart;
             }
-            Py_UCS4 ch2;
             if (end - s < 2) {
                 /* unexpected end of data: the caller will decide whether
                    it's an error or not */

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

From python-checkins at python.org  Mon Nov  5 00:44:28 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Mon,  5 Nov 2012 00:44:28 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MzUw?=
 =?utf-8?q?=3A_Fix_zlib_decompressor_handling_of_unused=5Fdata_with_multip?=
 =?utf-8?q?le_calls?=
Message-ID: <3XvtsS3xJFzQ2J@mail.python.org>

http://hg.python.org/cpython/rev/be882735e0b6
changeset:   80255:be882735e0b6
branch:      3.2
parent:      80249:56bc323288d1
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Mon Nov 05 00:37:42 2012 +0100
summary:
  Issue #16350: Fix zlib decompressor handling of unused_data with multiple calls to decompress() after EOF.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  13 +++++++++++++
  Misc/NEWS             |   4 ++++
  Modules/zlibmodule.c  |  29 +++++++++++++++++++++++------
  3 files changed, 40 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -434,6 +434,19 @@
         y += dco.flush()
         self.assertEqual(y, b'foo')
 
+    def test_decompress_unused_data(self):
+        # Repeated calls to decompress() after EOF should accumulate data in
+        # dco.unused_data, instead of just storing the arg to the last call.
+        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
+        for step in 1, 2, 100:
+            dco = zlib.decompressobj()
+            data = b''.join(dco.decompress(x[i : i + step])
+                            for i in range(0, len(x), step))
+            data += dco.flush()
+
+            self.assertEqual(data, HAMLET_SCENE)
+            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -156,6 +156,10 @@
 Library
 -------
 
+- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+  successive calls after EOF in unused_data, instead of only saving the argument
+  to the last call. Patch by Serhiy Storchaka.
+
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -610,12 +610,29 @@
        preserved.
     */
     if (err == Z_STREAM_END) {
-        Py_XDECREF(self->unused_data);  /* Free original empty string */
-        self->unused_data = PyBytes_FromStringAndSize(
-            (char *)self->zst.next_in, self->zst.avail_in);
-        if (self->unused_data == NULL) {
-            Py_DECREF(RetVal);
-            goto error;
+        if (self->zst.avail_in > 0) {
+            /* Append the leftover data to the existing value of unused_data. */
+            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size = old_size + self->zst.avail_in;
+            PyObject *new_data;
+            if (new_size <= old_size) {  /* Check for overflow. */
+                PyErr_NoMemory();
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            new_data = PyBytes_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL) {
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            Py_MEMCPY(PyBytes_AS_STRING(new_data),
+                      PyBytes_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
         }
         /* We will only get Z_BUF_ERROR if the output buffer was full
            but there wasn't more output when we tried again, so it is

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

From python-checkins at python.org  Mon Nov  5 00:44:29 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Mon,  5 Nov 2012 00:44:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316350=3A_Fix_zlib_decompressor_handling_of_unused=5Fd?=
 =?utf-8?q?ata_with_multiple_calls?=
Message-ID: <3XvtsT6Dx3zQ2J@mail.python.org>

http://hg.python.org/cpython/rev/4182119c3f0a
changeset:   80256:4182119c3f0a
branch:      3.3
parent:      80253:96f4cee8ea5e
parent:      80255:be882735e0b6
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Mon Nov 05 00:38:48 2012 +0100
summary:
  Issue #16350: Fix zlib decompressor handling of unused_data with multiple calls to decompress() after EOF.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  14 ++++++++++++++
  Misc/NEWS             |   4 ++++
  Modules/zlibmodule.c  |  29 +++++++++++++++++++++++------
  3 files changed, 41 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -487,6 +487,20 @@
         dco.flush()
         self.assertFalse(dco.eof)
 
+    def test_decompress_unused_data(self):
+        # Repeated calls to decompress() after EOF should accumulate data in
+        # dco.unused_data, instead of just storing the arg to the last call.
+        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
+        for step in 1, 2, 100:
+            dco = zlib.decompressobj()
+            data = b''.join(dco.decompress(x[i : i + step])
+                            for i in range(0, len(x), step))
+            data += dco.flush()
+
+            self.assertTrue(dco.eof)
+            self.assertEqual(data, HAMLET_SCENE)
+            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -77,6 +77,10 @@
 Library
 -------
 
+- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+  successive calls after EOF in unused_data, instead of only saving the argument
+  to the last call. Patch by Serhiy Storchaka.
+
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -693,12 +693,29 @@
        preserved.
     */
     if (err == Z_STREAM_END) {
-        Py_XDECREF(self->unused_data);  /* Free original empty string */
-        self->unused_data = PyBytes_FromStringAndSize(
-            (char *)self->zst.next_in, self->zst.avail_in);
-        if (self->unused_data == NULL) {
-            Py_DECREF(RetVal);
-            goto error;
+        if (self->zst.avail_in > 0) {
+            /* Append the leftover data to the existing value of unused_data. */
+            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size = old_size + self->zst.avail_in;
+            PyObject *new_data;
+            if (new_size <= old_size) {  /* Check for overflow. */
+                PyErr_NoMemory();
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            new_data = PyBytes_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL) {
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            Py_MEMCPY(PyBytes_AS_STRING(new_data),
+                      PyBytes_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
         }
         self->eof = 1;
         /* We will only get Z_BUF_ERROR if the output buffer was full

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

From python-checkins at python.org  Mon Nov  5 00:44:31 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Mon,  5 Nov 2012 00:44:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316350=3A_Fix_zlib_decompressor_handling_of_unus?=
 =?utf-8?q?ed=5Fdata_with_multiple_calls?=
Message-ID: <3XvtsW1mJczRD0@mail.python.org>

http://hg.python.org/cpython/rev/bcdb3836be72
changeset:   80257:bcdb3836be72
parent:      80254:6f44f33460cd
parent:      80256:4182119c3f0a
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Mon Nov 05 00:40:00 2012 +0100
summary:
  Issue #16350: Fix zlib decompressor handling of unused_data with multiple calls to decompress() after EOF.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  14 ++++++++++++++
  Misc/NEWS             |   4 ++++
  Modules/zlibmodule.c  |  29 +++++++++++++++++++++++------
  3 files changed, 41 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -487,6 +487,20 @@
         dco.flush()
         self.assertFalse(dco.eof)
 
+    def test_decompress_unused_data(self):
+        # Repeated calls to decompress() after EOF should accumulate data in
+        # dco.unused_data, instead of just storing the arg to the last call.
+        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
+        for step in 1, 2, 100:
+            dco = zlib.decompressobj()
+            data = b''.join(dco.decompress(x[i : i + step])
+                            for i in range(0, len(x), step))
+            data += dco.flush()
+
+            self.assertTrue(dco.eof)
+            self.assertEqual(data, HAMLET_SCENE)
+            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,6 +107,10 @@
 Library
 -------
 
+- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+  successive calls after EOF in unused_data, instead of only saving the argument
+  to the last call. Patch by Serhiy Storchaka.
+
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -693,12 +693,29 @@
        preserved.
     */
     if (err == Z_STREAM_END) {
-        Py_XDECREF(self->unused_data);  /* Free original empty string */
-        self->unused_data = PyBytes_FromStringAndSize(
-            (char *)self->zst.next_in, self->zst.avail_in);
-        if (self->unused_data == NULL) {
-            Py_DECREF(RetVal);
-            goto error;
+        if (self->zst.avail_in > 0) {
+            /* Append the leftover data to the existing value of unused_data. */
+            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size = old_size + self->zst.avail_in;
+            PyObject *new_data;
+            if (new_size <= old_size) {  /* Check for overflow. */
+                PyErr_NoMemory();
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            new_data = PyBytes_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL) {
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            Py_MEMCPY(PyBytes_AS_STRING(new_data),
+                      PyBytes_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
         }
         self->eof = 1;
         /* We will only get Z_BUF_ERROR if the output buffer was full

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

From python-checkins at python.org  Mon Nov  5 00:57:27 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Mon,  5 Nov 2012 00:57:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MzUw?=
 =?utf-8?q?=3A_Fix_zlib_decompressor_handling_of_unused=5Fdata_with_multip?=
 =?utf-8?q?le_calls?=
Message-ID: <3Xvv8R6RYtzR5Q@mail.python.org>

http://hg.python.org/cpython/rev/1c54def5947c
changeset:   80258:1c54def5947c
branch:      2.7
parent:      80250:daa1a7a51319
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Mon Nov 05 00:55:06 2012 +0100
summary:
  Issue #16350: Fix zlib decompressor handling of unused_data with multiple calls to decompress() after EOF.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  13 +++++++++++++
  Misc/NEWS             |   4 ++++
  Modules/zlibmodule.c  |  29 +++++++++++++++++++++++------
  3 files changed, 40 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -426,6 +426,19 @@
             c.flush()
             self.assertRaises(ValueError, c.copy)
 
+    def test_decompress_unused_data(self):
+        # Repeated calls to decompress() after EOF should accumulate data in
+        # dco.unused_data, instead of just storing the arg to the last call.
+        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
+        for step in 1, 2, 100:
+            dco = zlib.decompressobj()
+            data = b''.join(dco.decompress(x[i : i + step])
+                            for i in range(0, len(x), step))
+            data += dco.flush()
+
+            self.assertEqual(data, HAMLET_SCENE)
+            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+
     if hasattr(zlib.decompressobj(), "copy"):
         def test_decompresscopy(self):
             # Test copying a decompression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,10 @@
 Library
 -------
 
+- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+  successive calls after EOF in unused_data, instead of only saving the argument
+  to the last call. Patch by Serhiy Storchaka.
+
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -566,12 +566,29 @@
        preserved.
     */
     if (err == Z_STREAM_END) {
-        Py_XDECREF(self->unused_data);  /* Free original empty string */
-        self->unused_data = PyString_FromStringAndSize(
-            (char *)self->zst.next_in, self->zst.avail_in);
-        if (self->unused_data == NULL) {
-            Py_DECREF(RetVal);
-            goto error;
+        if (self->zst.avail_in > 0) {
+            /* Append the leftover data to the existing value of unused_data. */
+            Py_ssize_t old_size = PyString_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size = old_size + self->zst.avail_in;
+            PyObject *new_data;
+            if (new_size <= old_size) {  /* Check for overflow. */
+                PyErr_NoMemory();
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            new_data = PyString_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL) {
+                Py_DECREF(RetVal);
+                RetVal = NULL;
+                goto error;
+            }
+            Py_MEMCPY(PyString_AS_STRING(new_data),
+                      PyString_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyString_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
         }
         /* We will only get Z_BUF_ERROR if the output buffer was full
            but there wasn't more output when we tried again, so it is

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

From python-checkins at python.org  Mon Nov  5 01:21:14 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon,  5 Nov 2012 01:21:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Oops=2C_?=
 =?utf-8?q?fix_regression_in_os=2Eopen=28=29_on_Windows?=
Message-ID: <3Xvvgt3cq6zR94@mail.python.org>

http://hg.python.org/cpython/rev/817a90752470
changeset:   80259:817a90752470
parent:      80257:bcdb3836be72
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 05 01:20:58 2012 +0100
summary:
  Issue #15478: Oops, fix regression in os.open() on Windows

os.open() uses _wopen() which sets errno, not the Windows error code.

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
@@ -7057,7 +7057,7 @@
     Py_END_ALLOW_THREADS
 
     if (fd == -1) {
-        return_value = path_error(&path);
+        PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, path.object);
         goto exit;
     }
 

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

From python-checkins at python.org  Mon Nov  5 01:28:17 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon,  5 Nov 2012 01:28:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_Fix_test?=
	=?utf-8?q?=5Fpep277_on_Windows?=
Message-ID: <3Xvvr16xSZzPjB@mail.python.org>

http://hg.python.org/cpython/rev/11ea4eb79e9d
changeset:   80260:11ea4eb79e9d
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 05 01:28:28 2012 +0100
summary:
  Issue #15478: Fix test_pep277 on Windows

os.listdir() now returns the original path in OSError.filename (on any
platform), even if "*.*" was added to the path (on Windows).

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


diff --git a/Lib/test/test_pep277.py b/Lib/test/test_pep277.py
--- a/Lib/test/test_pep277.py
+++ b/Lib/test/test_pep277.py
@@ -99,10 +99,6 @@
         with self.assertRaises(expected_exception) as c:
             fn(filename)
         exc_filename = c.exception.filename
-        # listdir may append a wildcard to the filename
-        if fn is os.listdir and sys.platform == 'win32':
-            exc_filename, _, wildcard = exc_filename.rpartition(os.sep)
-            self.assertEqual(wildcard, '*.*')
         if check_filename:
             self.assertEqual(exc_filename, filename, "Function '%s(%a) failed "
                              "with bad filename in the exception: %a" %

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

From python-checkins at python.org  Mon Nov  5 02:06:24 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon,  5 Nov 2012 02:06:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogQ2xvc2UgIzE1MTY1?=
 =?utf-8?q?=3A_Fix_test=5Femail_on_Windows_64_bits?=
Message-ID: <3Xvwh019xfzRCB@mail.python.org>

http://hg.python.org/cpython/rev/367e376e5ba2
changeset:   80261:367e376e5ba2
branch:      3.3
parent:      80256:4182119c3f0a
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 05 02:06:13 2012 +0100
summary:
  Close #15165: Fix test_email on Windows 64 bits

Use year 1990 instead of year 1970 to avoid issues with negative timestamps.

files:
  Lib/test/test_email/test_utils.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -91,7 +91,7 @@
     @test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
     def test_localtime_epoch_utc_daylight_true(self):
         test.support.patch(self, time, 'daylight', True)
-        t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc)
+        t0 = datetime.datetime(1990, 1, 1, tzinfo = datetime.timezone.utc)
         t1 = utils.localtime(t0)
         t2 = t0 - datetime.timedelta(hours=5)
         t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5)))
@@ -100,7 +100,7 @@
     @test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
     def test_localtime_epoch_utc_daylight_false(self):
         test.support.patch(self, time, 'daylight', False)
-        t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc)
+        t0 = datetime.datetime(1990, 1, 1, tzinfo = datetime.timezone.utc)
         t1 = utils.localtime(t0)
         t2 = t0 - datetime.timedelta(hours=5)
         t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5)))
@@ -108,14 +108,14 @@
 
     def test_localtime_epoch_notz_daylight_true(self):
         test.support.patch(self, time, 'daylight', True)
-        t0 = datetime.datetime(1970, 1, 1)
+        t0 = datetime.datetime(1990, 1, 1)
         t1 = utils.localtime(t0)
         t2 = utils.localtime(t0.replace(tzinfo=None))
         self.assertEqual(t1, t2)
 
     def test_localtime_epoch_notz_daylight_false(self):
         test.support.patch(self, time, 'daylight', False)
-        t0 = datetime.datetime(1970, 1, 1)
+        t0 = datetime.datetime(1990, 1, 1)
         t1 = utils.localtime(t0)
         t2 = utils.localtime(t0.replace(tzinfo=None))
         self.assertEqual(t1, t2)

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

From python-checkins at python.org  Mon Nov  5 02:06:25 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon,  5 Nov 2012 02:06:25 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_=28Merge_3=2E3=29_Close_=2315165=3A_Fix_test=5Femail_on_?=
 =?utf-8?q?Windows_64_bits?=
Message-ID: <3Xvwh13xpgzRGK@mail.python.org>

http://hg.python.org/cpython/rev/651e8613e579
changeset:   80262:651e8613e579
parent:      80260:11ea4eb79e9d
parent:      80261:367e376e5ba2
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 05 02:06:34 2012 +0100
summary:
  (Merge 3.3) Close #15165: Fix test_email on Windows 64 bits

Use year 1990 instead of year 1970 to avoid issues with negative timestamps.

files:
  Lib/test/test_email/test_utils.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -91,7 +91,7 @@
     @test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
     def test_localtime_epoch_utc_daylight_true(self):
         test.support.patch(self, time, 'daylight', True)
-        t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc)
+        t0 = datetime.datetime(1990, 1, 1, tzinfo = datetime.timezone.utc)
         t1 = utils.localtime(t0)
         t2 = t0 - datetime.timedelta(hours=5)
         t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5)))
@@ -100,7 +100,7 @@
     @test.support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0')
     def test_localtime_epoch_utc_daylight_false(self):
         test.support.patch(self, time, 'daylight', False)
-        t0 = datetime.datetime(1970, 1, 1, tzinfo = datetime.timezone.utc)
+        t0 = datetime.datetime(1990, 1, 1, tzinfo = datetime.timezone.utc)
         t1 = utils.localtime(t0)
         t2 = t0 - datetime.timedelta(hours=5)
         t2 = t2.replace(tzinfo = datetime.timezone(datetime.timedelta(hours=-5)))
@@ -108,14 +108,14 @@
 
     def test_localtime_epoch_notz_daylight_true(self):
         test.support.patch(self, time, 'daylight', True)
-        t0 = datetime.datetime(1970, 1, 1)
+        t0 = datetime.datetime(1990, 1, 1)
         t1 = utils.localtime(t0)
         t2 = utils.localtime(t0.replace(tzinfo=None))
         self.assertEqual(t1, t2)
 
     def test_localtime_epoch_notz_daylight_false(self):
         test.support.patch(self, time, 'daylight', False)
-        t0 = datetime.datetime(1970, 1, 1)
+        t0 = datetime.datetime(1990, 1, 1)
         t1 = utils.localtime(t0)
         t2 = utils.localtime(t0.replace(tzinfo=None))
         self.assertEqual(t1, t2)

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

From solipsis at pitrou.net  Mon Nov  5 05:54:27 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 05 Nov 2012 05:54:27 +0100
Subject: [Python-checkins] Daily reference leaks (651e8613e579): sum=0
Message-ID: <E1TVEhf-0006eb-Bp@ap.vmr.nerim.net>

results for 651e8613e579 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Mon Nov  5 07:20:25 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Mon,  5 Nov 2012 07:20:25 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316218=3A_Fix_test?=
	=?utf-8?q?_for_issue_again?=
Message-ID: <3Xw3fK6lpqzRHX@mail.python.org>

http://hg.python.org/cpython/rev/56df0d4f0011
changeset:   80263:56df0d4f0011
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Mon Nov 05 08:20:15 2012 +0200
summary:
  Issue #16218: Fix test for issue again

files:
  Lib/test/test_cmd_line_script.py |  37 ++++++++++---------
  1 files changed, 19 insertions(+), 18 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,25 +363,26 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
-    def test_non_utf8(self):
+    def test_non_ascii(self):
         # Issue #16218
-        with temp_dir() as script_dir:
-            script_basename = '\u0441\u043a\u0440\u0438\u043f\u0442'
-            try:
-                script_basename.encode(sys.getfilesystemencoding())
-            except UnicodeEncodeError:
-                raise unittest.SkipTest("Filesystem doesn't support "
-                                        "unicode names")
-            source = 'print("test output")\n'
-            script_name = _make_test_script(script_dir, script_basename, source)
-            if not __debug__:
-                run_args = ('-' + 'O' * sys.flags.optimize, script_name)
-            else:
-                run_args = (script_name,)
-            rc, out, _ = assert_python_ok(*run_args)
-            self.assertEqual(0, rc)
-            expected = ("test output" + os.linesep).encode('ascii')
-            self.assertEqual(expected, out)
+        # non-ascii filename encodable to cp1252, cp932, latin1 and utf8
+        filename = support.TESTFN + '\xa3.py'
+        try:
+            os.fsencode(filename)
+        except UnicodeEncodeError:
+            self.skipTest(
+                "Filesystem encoding %r cannot encode "
+                "the filename: %a"
+                % (sys.getfilesystemencoding(), filename))
+        source = 'print(ascii(__file__))\n'
+        script_name = _make_test_script(os.curdir, filename, source)
+        self.addCleanup(support.unlink, script_name)
+        rc, stdout, stderr = assert_python_ok(script_name)
+        self.assertEqual(
+            ascii(script_name),
+            stdout.rstrip().decode('ascii'),
+            'stdout=%r stderr=%r' % (stdout, stderr))
+        self.assertEqual(0, rc)
 
 
 def test_main():

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

From python-checkins at python.org  Mon Nov  5 08:28:54 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Mon,  5 Nov 2012 08:28:54 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Revome_extra_=2Epy_suffix?=
Message-ID: <3Xw59L0dvSzRQH@mail.python.org>

http://hg.python.org/cpython/rev/141852a8697a
changeset:   80264:141852a8697a
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Mon Nov 05 09:28:42 2012 +0200
summary:
  Revome extra .py suffix

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


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -366,7 +366,7 @@
     def test_non_ascii(self):
         # Issue #16218
         # non-ascii filename encodable to cp1252, cp932, latin1 and utf8
-        filename = support.TESTFN + '\xa3.py'
+        filename = support.TESTFN + '\xa3'
         try:
             os.fsencode(filename)
         except UnicodeEncodeError:

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

From python-checkins at python.org  Mon Nov  5 08:34:57 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Mon,  5 Nov 2012 08:34:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315641=3A_Clean_up?=
 =?utf-8?q?_deprecated_classes_from_importlib?=
Message-ID: <3Xw5JK4XjNzRPk@mail.python.org>

http://hg.python.org/cpython/rev/48228fb874c1
changeset:   80265:48228fb874c1
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Mon Nov 05 09:34:46 2012 +0200
summary:
  Issue #15641: Clean up deprecated classes from importlib

Patch by Taras Lyapun.

files:
  Doc/library/importlib.rst                         |  138 --
  Lib/importlib/abc.py                              |  177 ---
  Lib/test/test_importlib/source/test_abc_loader.py |  505 +---------
  Lib/test/test_importlib/test_abc.py               |   18 +-
  Misc/NEWS                                         |    3 +
  5 files changed, 7 insertions(+), 834 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -133,8 +133,6 @@
                +-- ExecutionLoader --+
                                      +-- FileLoader
                                      +-- SourceLoader
-                                          +-- PyLoader (deprecated)
-                                          +-- PyPycLoader (deprecated)
 
 
 .. class:: Finder
@@ -431,142 +429,6 @@
         itself does not end in ``__init__``.
 
 
-.. class:: PyLoader
-
-    An abstract base class inheriting from
-    :class:`ExecutionLoader` and
-    :class:`ResourceLoader` designed to ease the loading of
-    Python source modules (bytecode is not handled; see
-    :class:`SourceLoader` for a source/bytecode ABC). A subclass
-    implementing this ABC will only need to worry about exposing how the source
-    code is stored; all other details for loading Python source code will be
-    handled by the concrete implementations of key methods.
-
-    .. deprecated:: 3.2
-        This class has been deprecated in favor of :class:`SourceLoader` and is
-        slated for removal in Python 3.4. See below for how to create a
-        subclass that is compatible with Python 3.1 onwards.
-
-    If compatibility with Python 3.1 is required, then use the following idiom
-    to implement a subclass that will work with Python 3.1 onwards (make sure
-    to implement :meth:`ExecutionLoader.get_filename`)::
-
-        try:
-            from importlib.abc import SourceLoader
-        except ImportError:
-            from importlib.abc import PyLoader as SourceLoader
-
-
-        class CustomLoader(SourceLoader):
-            def get_filename(self, fullname):
-                """Return the path to the source file."""
-                # Implement ...
-
-            def source_path(self, fullname):
-                """Implement source_path in terms of get_filename."""
-                try:
-                    return self.get_filename(fullname)
-                except ImportError:
-                    return None
-
-            def is_package(self, fullname):
-                """Implement is_package by looking for an __init__ file
-                name as returned by get_filename."""
-                filename = os.path.basename(self.get_filename(fullname))
-                return os.path.splitext(filename)[0] == '__init__'
-
-
-    .. method:: source_path(fullname)
-
-        An abstract method that returns the path to the source code for a
-        module. Should return ``None`` if there is no source code.
-        Raises :exc:`ImportError` if the loader knows it cannot handle the
-        module.
-
-    .. method:: get_filename(fullname)
-
-        A concrete implementation of
-        :meth:`importlib.abc.ExecutionLoader.get_filename` that
-        relies on :meth:`source_path`. If :meth:`source_path` returns
-        ``None``, then :exc:`ImportError` is raised.
-
-    .. method:: load_module(fullname)
-
-        A concrete implementation of :meth:`importlib.abc.Loader.load_module`
-        that loads Python source code. All needed information comes from the
-        abstract methods required by this ABC. The only pertinent assumption
-        made by this method is that when loading a package
-        :attr:`__path__` is set to ``[os.path.dirname(__file__)]``.
-
-    .. method:: get_code(fullname)
-
-        A concrete implementation of
-        :meth:`importlib.abc.InspectLoader.get_code` that creates code objects
-        from Python source code, by requesting the source code (using
-        :meth:`source_path` and :meth:`get_data`) and compiling it with the
-        built-in :func:`compile` function.
-
-    .. method:: get_source(fullname)
-
-        A concrete implementation of
-        :meth:`importlib.abc.InspectLoader.get_source`. Uses
-        :meth:`importlib.abc.ResourceLoader.get_data` and :meth:`source_path`
-        to get the source code.  It tries to guess the source encoding using
-        :func:`tokenize.detect_encoding`.
-
-
-.. class:: PyPycLoader
-
-    An abstract base class inheriting from :class:`PyLoader`.
-    This ABC is meant to help in creating loaders that support both Python
-    source and bytecode.
-
-    .. deprecated:: 3.2
-        This class has been deprecated in favor of :class:`SourceLoader` and to
-        properly support :pep:`3147`. If compatibility is required with
-        Python 3.1, implement both :class:`SourceLoader` and :class:`PyLoader`;
-        instructions on how to do so are included in the documentation for
-        :class:`PyLoader`. Do note that this solution will not support
-        sourceless/bytecode-only loading; only source *and* bytecode loading.
-
-    .. versionchanged:: 3.3
-       Updated to parse (but not use) the new source size field in bytecode
-       files when reading and to write out the field properly when writing.
-
-    .. method:: source_mtime(fullname)
-
-        An abstract method which returns the modification time for the source
-        code of the specified module. The modification time should be an
-        integer. If there is no source code, return ``None``. If the
-        module cannot be found then :exc:`ImportError` is raised.
-
-    .. method:: bytecode_path(fullname)
-
-        An abstract method which returns the path to the bytecode for the
-        specified module, if it exists. It returns ``None``
-        if no bytecode exists (yet).
-        Raises :exc:`ImportError` if the loader knows it cannot handle the
-        module.
-
-    .. method:: get_filename(fullname)
-
-        A concrete implementation of
-        :meth:`ExecutionLoader.get_filename` that relies on
-        :meth:`PyLoader.source_path` and :meth:`bytecode_path`.
-        If :meth:`source_path` returns a path, then that value is returned.
-        Else if :meth:`bytecode_path` returns a path, that path will be
-        returned. If a path is not available from both methods,
-        :exc:`ImportError` is raised.
-
-    .. method:: write_bytecode(fullname, bytecode)
-
-        An abstract method which has the loader write *bytecode* for future
-        use. If the bytecode is written, return ``True``. Return
-        ``False`` if the bytecode could not be written. This method
-        should not be called if :data:`sys.dont_write_bytecode` is true.
-        The *bytecode* argument should be a bytes string or bytes array.
-
-
 :mod:`importlib.machinery` -- Importers and path hooks
 ------------------------------------------------------
 
diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py
--- a/Lib/importlib/abc.py
+++ b/Lib/importlib/abc.py
@@ -225,180 +225,3 @@
         raise NotImplementedError
 
 _register(SourceLoader, machinery.SourceFileLoader)
-
-class PyLoader(SourceLoader):
-
-    """Implement the deprecated PyLoader ABC in terms of SourceLoader.
-
-    This class has been deprecated! It is slated for removal in Python 3.4.
-    If compatibility with Python 3.1 is not needed then implement the
-    SourceLoader ABC instead of this class. If Python 3.1 compatibility is
-    needed, then use the following idiom to have a single class that is
-    compatible with Python 3.1 onwards::
-
-        try:
-            from importlib.abc import SourceLoader
-        except ImportError:
-            from importlib.abc import PyLoader as SourceLoader
-
-
-        class CustomLoader(SourceLoader):
-            def get_filename(self, fullname):
-                # Implement ...
-
-            def source_path(self, fullname):
-                '''Implement source_path in terms of get_filename.'''
-                try:
-                    return self.get_filename(fullname)
-                except ImportError:
-                    return None
-
-            def is_package(self, fullname):
-                filename = os.path.basename(self.get_filename(fullname))
-                return os.path.splitext(filename)[0] == '__init__'
-
-    """
-
-    @abc.abstractmethod
-    def is_package(self, fullname):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def source_path(self, fullname):
-        """Abstract method.  Accepts a str module name and returns the path to
-        the source code for the module."""
-        raise NotImplementedError
-
-    def get_filename(self, fullname):
-        """Implement get_filename in terms of source_path.
-
-        As get_filename should only return a source file path there is no
-        chance of the path not existing but loading still being possible, so
-        ImportError should propagate instead of being turned into returning
-        None.
-
-        """
-        warnings.warn("importlib.abc.PyLoader is deprecated and is "
-                            "slated for removal in Python 3.4; "
-                            "use SourceLoader instead. "
-                            "See the importlib documentation on how to be "
-                            "compatible with Python 3.1 onwards.",
-                        DeprecationWarning)
-        path = self.source_path(fullname)
-        if path is None:
-            raise ImportError(name=fullname)
-        else:
-            return path
-
-
-class PyPycLoader(PyLoader):
-
-    """Abstract base class to assist in loading source and bytecode by
-    requiring only back-end storage methods to be implemented.
-
-    This class has been deprecated! Removal is slated for Python 3.4. Implement
-    the SourceLoader ABC instead. If Python 3.1 compatibility is needed, see
-    PyLoader.
-
-    The methods get_code, get_source, and load_module are implemented for the
-    user.
-
-    """
-
-    def get_filename(self, fullname):
-        """Return the source or bytecode file path."""
-        path = self.source_path(fullname)
-        if path is not None:
-            return path
-        path = self.bytecode_path(fullname)
-        if path is not None:
-            return path
-        raise ImportError("no source or bytecode path available for "
-                            "{0!r}".format(fullname), name=fullname)
-
-    def get_code(self, fullname):
-        """Get a code object from source or bytecode."""
-        warnings.warn("importlib.abc.PyPycLoader is deprecated and slated for "
-                            "removal in Python 3.4; use SourceLoader instead. "
-                            "If Python 3.1 compatibility is required, see the "
-                            "latest documentation for PyLoader.",
-                        DeprecationWarning)
-        source_timestamp = self.source_mtime(fullname)
-        # Try to use bytecode if it is available.
-        bytecode_path = self.bytecode_path(fullname)
-        if bytecode_path:
-            data = self.get_data(bytecode_path)
-            try:
-                magic = data[:4]
-                if len(magic) < 4:
-                    raise ImportError(
-                        "bad magic number in {}".format(fullname),
-                        name=fullname, path=bytecode_path)
-                raw_timestamp = data[4:8]
-                if len(raw_timestamp) < 4:
-                    raise EOFError("bad timestamp in {}".format(fullname))
-                pyc_timestamp = _bootstrap._r_long(raw_timestamp)
-                raw_source_size = data[8:12]
-                if len(raw_source_size) != 4:
-                    raise EOFError("bad file size in {}".format(fullname))
-                # Source size is unused as the ABC does not provide a way to
-                # get the size of the source ahead of reading it.
-                bytecode = data[12:]
-                # Verify that the magic number is valid.
-                if imp.get_magic() != magic:
-                    raise ImportError(
-                        "bad magic number in {}".format(fullname),
-                        name=fullname, path=bytecode_path)
-                # Verify that the bytecode is not stale (only matters when
-                # there is source to fall back on.
-                if source_timestamp:
-                    if pyc_timestamp < source_timestamp:
-                        raise ImportError("bytecode is stale", name=fullname,
-                                          path=bytecode_path)
-            except (ImportError, EOFError):
-                # If source is available give it a shot.
-                if source_timestamp is not None:
-                    pass
-                else:
-                    raise
-            else:
-                # Bytecode seems fine, so try to use it.
-                return marshal.loads(bytecode)
-        elif source_timestamp is None:
-            raise ImportError("no source or bytecode available to create code "
-                              "object for {0!r}".format(fullname),
-                              name=fullname)
-        # Use the source.
-        source_path = self.source_path(fullname)
-        if source_path is None:
-            message = "a source path must exist to load {0}".format(fullname)
-            raise ImportError(message, name=fullname)
-        source = self.get_data(source_path)
-        code_object = compile(source, source_path, 'exec', dont_inherit=True)
-        # Generate bytecode and write it out.
-        if not sys.dont_write_bytecode:
-            data = bytearray(imp.get_magic())
-            data.extend(_bootstrap._w_long(source_timestamp))
-            data.extend(_bootstrap._w_long(len(source) & 0xFFFFFFFF))
-            data.extend(marshal.dumps(code_object))
-            self.write_bytecode(fullname, data)
-        return code_object
-
-    @abc.abstractmethod
-    def source_mtime(self, fullname):
-        """Abstract method. Accepts a str filename and returns an int
-        modification time for the source of the module."""
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def bytecode_path(self, fullname):
-        """Abstract method. Accepts a str filename and returns the str pathname
-        to the bytecode for the module."""
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def write_bytecode(self, fullname, bytecode):
-        """Abstract method.  Accepts a str filename and bytes object
-        representing the bytecode for the module.  Returns a boolean
-        representing whether the bytecode was written or not."""
-        raise NotImplementedError
diff --git a/Lib/test/test_importlib/source/test_abc_loader.py b/Lib/test/test_importlib/source/test_abc_loader.py
--- a/Lib/test/test_importlib/source/test_abc_loader.py
+++ b/Lib/test/test_importlib/source/test_abc_loader.py
@@ -70,483 +70,9 @@
         return path == self.bytecode_path
 
 
-class PyLoaderMock(abc.PyLoader):
-
-    # Globals that should be defined for all modules.
-    source = (b"_ = '::'.join([__name__, __file__, __package__, "
-              b"repr(__loader__)])")
-
-    def __init__(self, data):
-        """Take a dict of 'module_name: path' pairings.
-
-        Paths should have no file extension, allowing packages to be denoted by
-        ending in '__init__'.
-
-        """
-        self.module_paths = data
-        self.path_to_module = {val:key for key,val in data.items()}
-
-    def get_data(self, path):
-        if path not in self.path_to_module:
-            raise IOError
-        return self.source
-
-    def is_package(self, name):
-        filename = os.path.basename(self.get_filename(name))
-        return os.path.splitext(filename)[0] == '__init__'
-
-    def source_path(self, name):
-        try:
-            return self.module_paths[name]
-        except KeyError:
-            raise ImportError
-
-    def get_filename(self, name):
-        """Silence deprecation warning."""
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            path = super().get_filename(name)
-            assert len(w) == 1
-            assert issubclass(w[0].category, DeprecationWarning)
-            return path
-
-    def module_repr(self):
-        return '<module>'
-
-
-class PyLoaderCompatMock(PyLoaderMock):
-
-    """Mock that matches what is suggested to have a loader that is compatible
-    from Python 3.1 onwards."""
-
-    def get_filename(self, fullname):
-        try:
-            return self.module_paths[fullname]
-        except KeyError:
-            raise ImportError
-
-    def source_path(self, fullname):
-        try:
-            return self.get_filename(fullname)
-        except ImportError:
-            return None
-
-
-class PyPycLoaderMock(abc.PyPycLoader, PyLoaderMock):
-
-    default_mtime = 1
-
-    def __init__(self, source, bc={}):
-        """Initialize mock.
-
-        'bc' is a dict keyed on a module's name. The value is dict with
-        possible keys of 'path', 'mtime', 'magic', and 'bc'. Except for 'path',
-        each of those keys control if any part of created bytecode is to
-        deviate from default values.
-
-        """
-        super().__init__(source)
-        self.module_bytecode = {}
-        self.path_to_bytecode = {}
-        self.bytecode_to_path = {}
-        for name, data in bc.items():
-            self.path_to_bytecode[data['path']] = name
-            self.bytecode_to_path[name] = data['path']
-            magic = data.get('magic', imp.get_magic())
-            mtime = importlib._w_long(data.get('mtime', self.default_mtime))
-            source_size = importlib._w_long(len(self.source) & 0xFFFFFFFF)
-            if 'bc' in data:
-                bc = data['bc']
-            else:
-                bc = self.compile_bc(name)
-            self.module_bytecode[name] = magic + mtime + source_size + bc
-
-    def compile_bc(self, name):
-        source_path = self.module_paths.get(name, '<test>') or '<test>'
-        code = compile(self.source, source_path, 'exec')
-        return marshal.dumps(code)
-
-    def source_mtime(self, name):
-        if name in self.module_paths:
-            return self.default_mtime
-        elif name in self.module_bytecode:
-            return None
-        else:
-            raise ImportError
-
-    def bytecode_path(self, name):
-        try:
-            return self.bytecode_to_path[name]
-        except KeyError:
-            if name in self.module_paths:
-                return None
-            else:
-                raise ImportError
-
-    def write_bytecode(self, name, bytecode):
-        self.module_bytecode[name] = bytecode
-        return True
-
-    def get_data(self, path):
-        if path in self.path_to_module:
-            return super().get_data(path)
-        elif path in self.path_to_bytecode:
-            name = self.path_to_bytecode[path]
-            return self.module_bytecode[name]
-        else:
-            raise IOError
-
-    def is_package(self, name):
-        try:
-            return super().is_package(name)
-        except TypeError:
-            return '__init__' in self.bytecode_to_path[name]
-
-    def get_code(self, name):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            code_object = super().get_code(name)
-            assert len(w) == 1
-            assert issubclass(w[0].category, DeprecationWarning)
-            return code_object
-
-class PyLoaderTests(testing_abc.LoaderTests):
-
-    """Tests for importlib.abc.PyLoader."""
-
-    mocker = PyLoaderMock
-
-    def eq_attrs(self, ob, **kwargs):
-        for attr, val in kwargs.items():
-            found = getattr(ob, attr)
-            self.assertEqual(found, val,
-                    "{} attribute: {} != {}".format(attr, found, val))
-
-    def test_module(self):
-        name = '<module>'
-        path = os.path.join('', 'path', 'to', 'module')
-        mock = self.mocker({name: path})
-        with util.uncache(name):
-            module = mock.load_module(name)
-            self.assertIn(name, sys.modules)
-        self.eq_attrs(module, __name__=name, __file__=path, __package__='',
-                        __loader__=mock)
-        self.assertTrue(not hasattr(module, '__path__'))
-        return mock, name
-
-    def test_package(self):
-        name = '<pkg>'
-        path = os.path.join('path', 'to', name, '__init__')
-        mock = self.mocker({name: path})
-        with util.uncache(name):
-            module = mock.load_module(name)
-            self.assertIn(name, sys.modules)
-        self.eq_attrs(module, __name__=name, __file__=path,
-                __path__=[os.path.dirname(path)], __package__=name,
-                __loader__=mock)
-        return mock, name
-
-    def test_lacking_parent(self):
-        name = 'pkg.mod'
-        path = os.path.join('path', 'to', 'pkg', 'mod')
-        mock = self.mocker({name: path})
-        with util.uncache(name):
-            module = mock.load_module(name)
-            self.assertIn(name, sys.modules)
-        self.eq_attrs(module, __name__=name, __file__=path, __package__='pkg',
-                        __loader__=mock)
-        self.assertFalse(hasattr(module, '__path__'))
-        return mock, name
-
-    def test_module_reuse(self):
-        name = 'mod'
-        path = os.path.join('path', 'to', 'mod')
-        module = imp.new_module(name)
-        mock = self.mocker({name: path})
-        with util.uncache(name):
-            sys.modules[name] = module
-            loaded_module = mock.load_module(name)
-            self.assertIs(loaded_module, module)
-            self.assertIs(sys.modules[name], module)
-        return mock, name
-
-    def test_state_after_failure(self):
-        name = "mod"
-        module = imp.new_module(name)
-        module.blah = None
-        mock = self.mocker({name: os.path.join('path', 'to', 'mod')})
-        mock.source = b"1/0"
-        with util.uncache(name):
-            sys.modules[name] = module
-            with self.assertRaises(ZeroDivisionError):
-                mock.load_module(name)
-            self.assertIs(sys.modules[name], module)
-            self.assertTrue(hasattr(module, 'blah'))
-        return mock
-
-    def test_unloadable(self):
-        name = "mod"
-        mock = self.mocker({name: os.path.join('path', 'to', 'mod')})
-        mock.source = b"1/0"
-        with util.uncache(name):
-            with self.assertRaises(ZeroDivisionError):
-                mock.load_module(name)
-            self.assertNotIn(name, sys.modules)
-        return mock
-
-
-class PyLoaderCompatTests(PyLoaderTests):
-
-    """Test that the suggested code to make a loader that is compatible from
-    Python 3.1 forward works."""
-
-    mocker = PyLoaderCompatMock
-
-
-class PyLoaderInterfaceTests(unittest.TestCase):
-
-    """Tests for importlib.abc.PyLoader to make sure that when source_path()
-    doesn't return a path everything works as expected."""
-
-    def test_no_source_path(self):
-        # No source path should lead to ImportError.
-        name = 'mod'
-        mock = PyLoaderMock({})
-        with util.uncache(name), self.assertRaises(ImportError):
-            mock.load_module(name)
-
-    def test_source_path_is_None(self):
-        name = 'mod'
-        mock = PyLoaderMock({name: None})
-        with util.uncache(name), self.assertRaises(ImportError):
-            mock.load_module(name)
-
-    def test_get_filename_with_source_path(self):
-        # get_filename() should return what source_path() returns.
-        name = 'mod'
-        path = os.path.join('path', 'to', 'source')
-        mock = PyLoaderMock({name: path})
-        with util.uncache(name):
-            self.assertEqual(mock.get_filename(name), path)
-
-    def test_get_filename_no_source_path(self):
-        # get_filename() should raise ImportError if source_path returns None.
-        name = 'mod'
-        mock = PyLoaderMock({name: None})
-        with util.uncache(name), self.assertRaises(ImportError):
-            mock.get_filename(name)
-
-
-class PyPycLoaderTests(PyLoaderTests):
-
-    """Tests for importlib.abc.PyPycLoader."""
-
-    mocker = PyPycLoaderMock
-
-    @source_util.writes_bytecode_files
-    def verify_bytecode(self, mock, name):
-        assert name in mock.module_paths
-        self.assertIn(name, mock.module_bytecode)
-        magic = mock.module_bytecode[name][:4]
-        self.assertEqual(magic, imp.get_magic())
-        mtime = importlib._r_long(mock.module_bytecode[name][4:8])
-        self.assertEqual(mtime, 1)
-        source_size = mock.module_bytecode[name][8:12]
-        self.assertEqual(len(mock.source) & 0xFFFFFFFF,
-                         importlib._r_long(source_size))
-        bc = mock.module_bytecode[name][12:]
-        self.assertEqual(bc, mock.compile_bc(name))
-
-    def test_module(self):
-        mock, name = super().test_module()
-        self.verify_bytecode(mock, name)
-
-    def test_package(self):
-        mock, name = super().test_package()
-        self.verify_bytecode(mock, name)
-
-    def test_lacking_parent(self):
-        mock, name = super().test_lacking_parent()
-        self.verify_bytecode(mock, name)
-
-    def test_module_reuse(self):
-        mock, name = super().test_module_reuse()
-        self.verify_bytecode(mock, name)
-
-    def test_state_after_failure(self):
-        super().test_state_after_failure()
-
-    def test_unloadable(self):
-        super().test_unloadable()
-
-
-class PyPycLoaderInterfaceTests(unittest.TestCase):
-
-    """Test for the interface of importlib.abc.PyPycLoader."""
-
-    def get_filename_check(self, src_path, bc_path, expect):
-        name = 'mod'
-        mock = PyPycLoaderMock({name: src_path}, {name: {'path': bc_path}})
-        with util.uncache(name):
-            assert mock.source_path(name) == src_path
-            assert mock.bytecode_path(name) == bc_path
-            self.assertEqual(mock.get_filename(name), expect)
-
-    def test_filename_with_source_bc(self):
-        # When source and bytecode paths present, return the source path.
-        self.get_filename_check('source_path', 'bc_path', 'source_path')
-
-    def test_filename_with_source_no_bc(self):
-        # With source but no bc, return source path.
-        self.get_filename_check('source_path', None, 'source_path')
-
-    def test_filename_with_no_source_bc(self):
-        # With not source but bc, return the bc path.
-        self.get_filename_check(None, 'bc_path', 'bc_path')
-
-    def test_filename_with_no_source_or_bc(self):
-        # With no source or bc, raise ImportError.
-        name = 'mod'
-        mock = PyPycLoaderMock({name: None}, {name: {'path': None}})
-        with util.uncache(name), self.assertRaises(ImportError):
-            mock.get_filename(name)
-
-
-class SkipWritingBytecodeTests(unittest.TestCase):
-
-    """Test that bytecode is properly handled based on
-    sys.dont_write_bytecode."""
-
-    @source_util.writes_bytecode_files
-    def run_test(self, dont_write_bytecode):
-        name = 'mod'
-        mock = PyPycLoaderMock({name: os.path.join('path', 'to', 'mod')})
-        sys.dont_write_bytecode = dont_write_bytecode
-        with util.uncache(name):
-            mock.load_module(name)
-        self.assertIsNot(name in mock.module_bytecode, dont_write_bytecode)
-
-    def test_no_bytecode_written(self):
-        self.run_test(True)
-
-    def test_bytecode_written(self):
-        self.run_test(False)
-
-
-class RegeneratedBytecodeTests(unittest.TestCase):
-
-    """Test that bytecode is regenerated as expected."""
-
-    @source_util.writes_bytecode_files
-    def test_different_magic(self):
-        # A different magic number should lead to new bytecode.
-        name = 'mod'
-        bad_magic = b'\x00\x00\x00\x00'
-        assert bad_magic != imp.get_magic()
-        mock = PyPycLoaderMock({name: os.path.join('path', 'to', 'mod')},
-                                {name: {'path': os.path.join('path', 'to',
-                                                    'mod.bytecode'),
-                                        'magic': bad_magic}})
-        with util.uncache(name):
-            mock.load_module(name)
-        self.assertIn(name, mock.module_bytecode)
-        magic = mock.module_bytecode[name][:4]
-        self.assertEqual(magic, imp.get_magic())
-
-    @source_util.writes_bytecode_files
-    def test_old_mtime(self):
-        # Bytecode with an older mtime should be regenerated.
-        name = 'mod'
-        old_mtime = PyPycLoaderMock.default_mtime - 1
-        mock = PyPycLoaderMock({name: os.path.join('path', 'to', 'mod')},
-                {name: {'path': 'path/to/mod.bytecode', 'mtime': old_mtime}})
-        with util.uncache(name):
-            mock.load_module(name)
-        self.assertIn(name, mock.module_bytecode)
-        mtime = importlib._r_long(mock.module_bytecode[name][4:8])
-        self.assertEqual(mtime, PyPycLoaderMock.default_mtime)
-
-
-class BadBytecodeFailureTests(unittest.TestCase):
-
-    """Test import failures when there is no source and parts of the bytecode
-    is bad."""
-
-    def test_bad_magic(self):
-        # A bad magic number should lead to an ImportError.
-        name = 'mod'
-        bad_magic = b'\x00\x00\x00\x00'
-        bc = {name:
-                {'path': os.path.join('path', 'to', 'mod'),
-                 'magic': bad_magic}}
-        mock = PyPycLoaderMock({name: None}, bc)
-        with util.uncache(name), self.assertRaises(ImportError) as cm:
-            mock.load_module(name)
-        self.assertEqual(cm.exception.name, name)
-
-    def test_no_bytecode(self):
-        # Missing code object bytecode should lead to an EOFError.
-        name = 'mod'
-        bc = {name: {'path': os.path.join('path', 'to', 'mod'), 'bc': b''}}
-        mock = PyPycLoaderMock({name: None}, bc)
-        with util.uncache(name), self.assertRaises(EOFError):
-            mock.load_module(name)
-
-    def test_bad_bytecode(self):
-        # Malformed code object bytecode should lead to a ValueError.
-        name = 'mod'
-        bc = {name: {'path': os.path.join('path', 'to', 'mod'), 'bc': b'1234'}}
-        mock = PyPycLoaderMock({name: None}, bc)
-        with util.uncache(name), self.assertRaises(ValueError):
-            mock.load_module(name)
-
-
 def raise_ImportError(*args, **kwargs):
     raise ImportError
 
-class MissingPathsTests(unittest.TestCase):
-
-    """Test what happens when a source or bytecode path does not exist (either
-    from *_path returning None or raising ImportError)."""
-
-    def test_source_path_None(self):
-        # Bytecode should be used when source_path returns None, along with
-        # __file__ being set to the bytecode path.
-        name = 'mod'
-        bytecode_path = 'path/to/mod'
-        mock = PyPycLoaderMock({name: None}, {name: {'path': bytecode_path}})
-        with util.uncache(name):
-            module = mock.load_module(name)
-        self.assertEqual(module.__file__, bytecode_path)
-
-    # Testing for bytecode_path returning None handled by all tests where no
-    # bytecode initially exists.
-
-    def test_all_paths_None(self):
-        # If all *_path methods return None, raise ImportError.
-        name = 'mod'
-        mock = PyPycLoaderMock({name: None})
-        with util.uncache(name), self.assertRaises(ImportError) as cm:
-            mock.load_module(name)
-        self.assertEqual(cm.exception.name, name)
-
-    def test_source_path_ImportError(self):
-        # An ImportError from source_path should trigger an ImportError.
-        name = 'mod'
-        mock = PyPycLoaderMock({}, {name: {'path': os.path.join('path', 'to',
-                                                                'mod')}})
-        with util.uncache(name), self.assertRaises(ImportError):
-            mock.load_module(name)
-
-    def test_bytecode_path_ImportError(self):
-        # An ImportError from bytecode_path should trigger an ImportError.
-        name = 'mod'
-        mock = PyPycLoaderMock({name: os.path.join('path', 'to', 'mod')})
-        bad_meth = types.MethodType(raise_ImportError, mock)
-        mock.bytecode_path = bad_meth
-        with util.uncache(name), self.assertRaises(ImportError) as cm:
-            mock.load_module(name)
-
 
 class SourceLoaderTestHarness(unittest.TestCase):
 
@@ -801,6 +327,7 @@
     class Loader(abc.Loader):
         def load_module(self, fullname):
             super().load_module(fullname)
+
         def module_repr(self, module):
             super().module_repr(module)
 
@@ -825,20 +352,6 @@
     class SourceLoader(ResourceLoader, ExecutionLoader, abc.SourceLoader):
         pass
 
-    class PyLoader(ResourceLoader, InspectLoader, abc.PyLoader):
-        def source_path(self, _):
-            super().source_path(_)
-
-    class PyPycLoader(PyLoader, abc.PyPycLoader):
-        def bytecode_path(self, _):
-            super().bytecode_path(_)
-
-        def source_mtime(self, _):
-            super().source_mtime(_)
-
-        def write_bytecode(self, _, _2):
-            super().write_bytecode(_, _2)
-
     def raises_NotImplementedError(self, ins, *args):
         for method_name in args:
             method = getattr(ins, method_name)
@@ -877,24 +390,12 @@
         # Required abstractmethods.
         self.raises_NotImplementedError(ins, 'get_filename', 'get_data')
         # Optional abstractmethods.
-        self.raises_NotImplementedError(ins,'path_stats', 'set_data')
-
-    def test_PyLoader(self):
-        self.raises_NotImplementedError(self.PyLoader(), 'source_path',
-                                        'get_data', 'is_package')
-
-    def test_PyPycLoader(self):
-        self.raises_NotImplementedError(self.PyPycLoader(), 'source_path',
-                                        'source_mtime', 'bytecode_path',
-                                        'write_bytecode')
+        self.raises_NotImplementedError(ins, 'path_stats', 'set_data')
 
 
 def test_main():
     from test.support import run_unittest
-    run_unittest(PyLoaderTests, PyLoaderCompatTests,
-                    PyLoaderInterfaceTests,
-                    PyPycLoaderTests, PyPycLoaderInterfaceTests,
-                    SkipWritingBytecodeTests, RegeneratedBytecodeTests,
+    run_unittest(SkipWritingBytecodeTests, RegeneratedBytecodeTests,
                     BadBytecodeFailureTests, MissingPathsTests,
                     SourceOnlyLoaderTests,
                     SourceLoaderBytecodeTests,
diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py
--- a/Lib/test/test_importlib/test_abc.py
+++ b/Lib/test/test_importlib/test_abc.py
@@ -43,11 +43,6 @@
     subclasses = [machinery.FileFinder]
 
 
-class Loader(InheritanceTests, unittest.TestCase):
-
-    subclasses = [abc.PyLoader]
-
-
 class ResourceLoader(InheritanceTests, unittest.TestCase):
 
     superclasses = [abc.Loader]
@@ -56,14 +51,13 @@
 class InspectLoader(InheritanceTests, unittest.TestCase):
 
     superclasses = [abc.Loader]
-    subclasses = [abc.PyLoader, machinery.BuiltinImporter,
+    subclasses = [machinery.BuiltinImporter,
                     machinery.FrozenImporter, machinery.ExtensionFileLoader]
 
 
 class ExecutionLoader(InheritanceTests, unittest.TestCase):
 
     superclasses = [abc.InspectLoader]
-    subclasses = [abc.PyLoader]
 
 
 class FileLoader(InheritanceTests, unittest.TestCase):
@@ -78,16 +72,6 @@
     subclasses = [machinery.SourceFileLoader]
 
 
-class PyLoader(InheritanceTests, unittest.TestCase):
-
-    superclasses = [abc.Loader, abc.ResourceLoader, abc.ExecutionLoader]
-
-
-class PyPycLoader(InheritanceTests, unittest.TestCase):
-
-    superclasses = [abc.PyLoader]
-
-
 def test_main():
     from test.support import run_unittest
     classes = []
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,6 +107,9 @@
 Library
 -------
 
+- Issue #15641: Clean up deprecated classes from importlib
+  Patch by Taras Lyapun.
+
 - Issue #16350: zlib.Decompress.decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
   to the last call. Patch by Serhiy Storchaka.

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

From python-checkins at python.org  Mon Nov  5 11:41:07 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  5 Nov 2012 11:41:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_The_migration_?=
 =?utf-8?q?to_importlib_eliminated_this_crasher?=
Message-ID: <3Xw9R73HmMzRF1@mail.python.org>

http://hg.python.org/cpython/rev/e29b50e1e8e5
changeset:   80266:e29b50e1e8e5
branch:      3.3
parent:      80261:367e376e5ba2
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 20:40:25 2012 +1000
summary:
  The migration to importlib eliminated this crasher

If anyone finds another recursive C path that bypasses the recursion
limiting, they can add a new crasher example.

files:
  Lib/test/crashers/recursion_limit_too_high.py |  16 ----------
  1 files changed, 0 insertions(+), 16 deletions(-)


diff --git a/Lib/test/crashers/recursion_limit_too_high.py b/Lib/test/crashers/recursion_limit_too_high.py
deleted file mode 100644
--- a/Lib/test/crashers/recursion_limit_too_high.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# The following example may crash or not depending on the platform.
-# E.g. on 32-bit Intel Linux in a "standard" configuration it seems to
-# crash on Python 2.5 (but not 2.4 nor 2.3).  On Windows the import
-# eventually fails to find the module, possibly because we run out of
-# file handles.
-
-# The point of this example is to show that sys.setrecursionlimit() is a
-# hack, and not a robust solution.  This example simply exercises a path
-# where it takes many C-level recursions, consuming a lot of stack
-# space, for each Python-level recursion.  So 1000 times this amount of
-# stack space may be too much for standard platforms already.
-
-import sys
-if 'recursion_limit_too_high' in sys.modules:
-    del sys.modules['recursion_limit_too_high']
-import recursion_limit_too_high

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

From python-checkins at python.org  Mon Nov  5 11:41:08 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  5 Nov 2012 11:41:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Merge_from_3=2E3?=
Message-ID: <3Xw9R85wnvzRG4@mail.python.org>

http://hg.python.org/cpython/rev/c4b5dfcb4a01
changeset:   80267:c4b5dfcb4a01
parent:      80265:48228fb874c1
parent:      80266:e29b50e1e8e5
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 20:40:57 2012 +1000
summary:
  Merge from 3.3

files:
  Lib/test/crashers/recursion_limit_too_high.py |  16 ----------
  1 files changed, 0 insertions(+), 16 deletions(-)


diff --git a/Lib/test/crashers/recursion_limit_too_high.py b/Lib/test/crashers/recursion_limit_too_high.py
deleted file mode 100644
--- a/Lib/test/crashers/recursion_limit_too_high.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# The following example may crash or not depending on the platform.
-# E.g. on 32-bit Intel Linux in a "standard" configuration it seems to
-# crash on Python 2.5 (but not 2.4 nor 2.3).  On Windows the import
-# eventually fails to find the module, possibly because we run out of
-# file handles.
-
-# The point of this example is to show that sys.setrecursionlimit() is a
-# hack, and not a robust solution.  This example simply exercises a path
-# where it takes many C-level recursions, consuming a lot of stack
-# space, for each Python-level recursion.  So 1000 times this amount of
-# stack space may be too much for standard platforms already.
-
-import sys
-if 'recursion_limit_too_high' in sys.modules:
-    del sys.modules['recursion_limit_too_high']
-import recursion_limit_too_high

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

From python-checkins at python.org  Mon Nov  5 12:33:35 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  5 Nov 2012 12:33:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Record_a_known?=
	=?utf-8?q?_crasher_from_=236717?=
Message-ID: <3XwBbg69pqzRG2@mail.python.org>

http://hg.python.org/cpython/rev/0dfa3b09a6fe
changeset:   80268:0dfa3b09a6fe
branch:      3.2
parent:      80255:be882735e0b6
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 21:26:57 2012 +1000
summary:
  Record a known crasher from #6717

files:
  Lib/test/crashers/trace_at_recursion_limit.py |  27 ++++++++++
  1 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/crashers/trace_at_recursion_limit.py b/Lib/test/crashers/trace_at_recursion_limit.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/crashers/trace_at_recursion_limit.py
@@ -0,0 +1,27 @@
+"""
+From http://bugs.python.org/issue6717
+
+A misbehaving trace hook can trigger a segfault by exceeding the recursion
+limit.
+"""
+import sys
+
+
+def x():
+    pass
+
+def g(*args):
+    if True: # change to True to crash interpreter
+        try:
+            x()
+        except:
+            pass
+    return g
+
+def f():
+    print(sys.getrecursionlimit())
+    f()
+
+sys.settrace(g)
+
+f()

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

From python-checkins at python.org  Mon Nov  5 12:33:37 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  5 Nov 2012 12:33:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_=236717_crasher_from_3=2E2?=
Message-ID: <3XwBbj1ZxmzRHd@mail.python.org>

http://hg.python.org/cpython/rev/509f7a53f8cc
changeset:   80269:509f7a53f8cc
branch:      3.3
parent:      80266:e29b50e1e8e5
parent:      80268:0dfa3b09a6fe
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 21:32:11 2012 +1000
summary:
  Merge #6717 crasher from 3.2

files:
  Lib/test/crashers/trace_at_recursion_limit.py |  27 ++++++++++
  1 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/crashers/trace_at_recursion_limit.py b/Lib/test/crashers/trace_at_recursion_limit.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/crashers/trace_at_recursion_limit.py
@@ -0,0 +1,27 @@
+"""
+From http://bugs.python.org/issue6717
+
+A misbehaving trace hook can trigger a segfault by exceeding the recursion
+limit.
+"""
+import sys
+
+
+def x():
+    pass
+
+def g(*args):
+    if True: # change to True to crash interpreter
+        try:
+            x()
+        except:
+            pass
+    return g
+
+def f():
+    print(sys.getrecursionlimit())
+    f()
+
+sys.settrace(g)
+
+f()

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

From python-checkins at python.org  Mon Nov  5 12:33:38 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  5 Nov 2012 12:33:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=236717_crasher_from_3=2E3?=
Message-ID: <3XwBbk41YmzRJb@mail.python.org>

http://hg.python.org/cpython/rev/47943fe516ec
changeset:   80270:47943fe516ec
parent:      80267:c4b5dfcb4a01
parent:      80269:509f7a53f8cc
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Nov 05 21:33:22 2012 +1000
summary:
  Merge #6717 crasher from 3.3

files:
  Lib/test/crashers/trace_at_recursion_limit.py |  27 ++++++++++
  1 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/crashers/trace_at_recursion_limit.py b/Lib/test/crashers/trace_at_recursion_limit.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/crashers/trace_at_recursion_limit.py
@@ -0,0 +1,27 @@
+"""
+From http://bugs.python.org/issue6717
+
+A misbehaving trace hook can trigger a segfault by exceeding the recursion
+limit.
+"""
+import sys
+
+
+def x():
+    pass
+
+def g(*args):
+    if True: # change to True to crash interpreter
+        try:
+            x()
+        except:
+            pass
+    return g
+
+def f():
+    print(sys.getrecursionlimit())
+    f()
+
+sys.settrace(g)
+
+f()

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

From python-checkins at python.org  Mon Nov  5 21:23:27 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon,  5 Nov 2012 21:23:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typo_notic?=
	=?utf-8?q?ed_by_Tom_Lynn=2E?=
Message-ID: <3XwQM36CJPzRFd@mail.python.org>

http://hg.python.org/cpython/rev/e99e7e2f61d2
changeset:   80271:e99e7e2f61d2
branch:      3.3
parent:      80269:509f7a53f8cc
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 22:22:48 2012 +0200
summary:
  Fix typo noticed by Tom Lynn.

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


diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -309,7 +309,7 @@
 
    On Windows versions older than Vista, :func:`monotonic` detects
    :c:func:`GetTickCount` integer overflow (32 bits, roll-over after 49.7 days).
-   It increases an internal epoch (reference time by) 2\ :sup:`32` each time
+   It increases an internal epoch (reference time) by 2\ :sup:`32` each time
    that an overflow is detected.  The epoch is stored in the process-local state
    and so the value of :func:`monotonic` may be different in two Python
    processes running for more than 49 days. On more recent versions of Windows

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

From python-checkins at python.org  Mon Nov  5 21:23:29 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon,  5 Nov 2012 21:23:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Merge_typo_fix=2E?=
Message-ID: <3XwQM51lwWzRGZ@mail.python.org>

http://hg.python.org/cpython/rev/ec00f8570c55
changeset:   80272:ec00f8570c55
parent:      80270:47943fe516ec
parent:      80271:e99e7e2f61d2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 05 22:23:16 2012 +0200
summary:
  Merge typo fix.

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


diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -309,7 +309,7 @@
 
    On Windows versions older than Vista, :func:`monotonic` detects
    :c:func:`GetTickCount` integer overflow (32 bits, roll-over after 49.7 days).
-   It increases an internal epoch (reference time by) 2\ :sup:`32` each time
+   It increases an internal epoch (reference time) by 2\ :sup:`32` each time
    that an overflow is detected.  The epoch is stored in the process-local state
    and so the value of :func:`monotonic` may be different in two Python
    processes running for more than 49 days. On more recent versions of Windows

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

From solipsis at pitrou.net  Tue Nov  6 05:55:19 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 06 Nov 2012 05:55:19 +0100
Subject: [Python-checkins] Daily reference leaks (ec00f8570c55): sum=0
Message-ID: <E1TVbC3-0006Zj-1O@ap.vmr.nerim.net>

results for ec00f8570c55 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Tue Nov  6 14:56:02 2012
From: python-checkins at python.org (tim.golden)
Date: Tue,  6 Nov 2012 14:56:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_issue9584=3A_Add_=7B=7D_li?=
 =?utf-8?q?st_expansion_to_glob=2E_Original_patch_by_Mathieu_Bridon?=
Message-ID: <3XwsjZ4sTWzLs9@mail.python.org>

http://hg.python.org/cpython/rev/dafca4714298
changeset:   80273:dafca4714298
user:        Tim Golden <mail at timgolden.me.uk>
date:        Tue Nov 06 13:50:42 2012 +0000
summary:
  issue9584: Add {} list expansion to glob. Original patch by Mathieu Bridon

files:
  Doc/library/glob.rst  |  11 ++--
  Lib/glob.py           |  65 ++++++++++++++++++++++--------
  Lib/test/test_glob.py |  64 +++++++++++++++++++++++++++++-
  Misc/NEWS             |   3 +
  4 files changed, 118 insertions(+), 25 deletions(-)


diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -13,10 +13,10 @@
 
 The :mod:`glob` module finds all the pathnames matching a specified pattern
 according to the rules used by the Unix shell.  No tilde expansion is done, but
-``*``, ``?``, and character ranges expressed with ``[]`` will be correctly
-matched.  This is done by using the :func:`os.listdir` and
-:func:`fnmatch.fnmatch` functions in concert, and not by actually invoking a
-subshell.  (For tilde and shell variable expansion, use
+``*``, ``?``, character ranges expressed with ``[]`` and list of options
+expressed with ``{}`` will be correctly matched.  This is done by using the
+:func:`os.listdir` and :func:`fnmatch.fnmatch` functions in concert, and not by
+actually invoking a subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
 
@@ -47,7 +47,8 @@
    ['1.gif', 'card.gif']
    >>> glob.glob('?.gif')
    ['1.gif']
-
+   >>> glob.glob('?.{gif,txt}')
+   ['1.gif', '2.txt']
 
 .. seealso::
 
diff --git a/Lib/glob.py b/Lib/glob.py
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -14,6 +14,7 @@
     """
     return list(iglob(pathname))
 
+
 def iglob(pathname):
     """Return an iterator which yields the paths matching a pathname pattern.
 
@@ -24,21 +25,24 @@
         if os.path.lexists(pathname):
             yield pathname
         return
-    dirname, basename = os.path.split(pathname)
-    if not dirname:
-        yield from glob1(None, basename)
-        return
-    if has_magic(dirname):
-        dirs = iglob(dirname)
-    else:
-        dirs = [dirname]
-    if has_magic(basename):
-        glob_in_dir = glob1
-    else:
-        glob_in_dir = glob0
-    for dirname in dirs:
-        for name in glob_in_dir(dirname, basename):
-            yield os.path.join(dirname, name)
+    pathnames = expand_braces(pathname)
+    for pathname in pathnames:
+      dirname, basename = os.path.split(pathname)
+      if not dirname:
+          yield from glob1(None, basename)
+          return
+
+      if has_magic(dirname):
+          dirs = iglob(dirname)
+      else:
+          dirs = [dirname]
+      if has_magic(basename):
+          glob_in_dir = glob1
+      else:
+          glob_in_dir = glob0
+      for dirname in dirs:
+          for name in glob_in_dir(dirname, basename):
+              yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`
@@ -70,12 +74,37 @@
     return []
 
 
-magic_check = re.compile('[*?[]')
-magic_check_bytes = re.compile(b'[*?[]')
-
+magic_check = re.compile('[*?[{]')
+magic_check_bytes = re.compile(b'[*?[{]')
 def has_magic(s):
     if isinstance(s, bytes):
         match = magic_check_bytes.search(s)
     else:
         match = magic_check.search(s)
     return match is not None
+
+brace_matcher = re.compile(r'.*(\{.+?[^\\]\})')
+def expand_braces(text):
+    """Find the rightmost, innermost set of braces and, if it contains a
+    comma-separated list, expand its contents recursively (any of its items
+    may itself be a list enclosed in braces).
+
+    Return the full set of expanded strings.
+    """
+    res = set()
+
+    match = brace_matcher.search(text)
+    if match is not None:
+        sub = match.group(1)
+        open_brace, close_brace = match.span(1)
+        if "," in sub:
+            for pat in sub.strip('{}').split(','):
+                res.update(expand_braces(text[:open_brace] + pat + text[close_brace:]))
+
+        else:
+            res.update(expand_braces(text[:open_brace] + sub.replace('}', '\\}') + text[close_brace:]))
+
+    else:
+        res.add(text.replace('\\}', '}'))
+
+    return res
diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -5,7 +5,7 @@
 import os
 import shutil
 
-class GlobTests(unittest.TestCase):
+class GlobTestsBase(unittest.TestCase):
 
     def norm(self, *parts):
         return os.path.normpath(os.path.join(self.tempdir, *parts))
@@ -45,6 +45,8 @@
     def assertSequencesEqual_noorder(self, l1, l2):
         self.assertEqual(set(l1), set(l2))
 
+class GlobTests(GlobTestsBase):
+
     def test_glob_literal(self):
         eq = self.assertSequencesEqual_noorder
         eq(self.glob('a'), [self.norm('a')])
@@ -105,9 +107,67 @@
         eq(self.glob('sym1'), [self.norm('sym1')])
         eq(self.glob('sym2'), [self.norm('sym2')])
 
+class GlobBracesTests(GlobTestsBase):
+
+    def setUp(self):
+        super(GlobBracesTests, self).setUp()
+        self.mktemp('c{}d')
+        self.mktemp('c{deg')
+        self.mktemp('c{dfg')
+        self.mktemp('cd{f}g')
+        self.mktemp('ce{f}g')
+        self.mktemp('cdf}g')
+        self.mktemp('cef}g')
+
+    def match_pattern_with_results(self, patterns, paths):
+        expected = [self.norm(path) for path in [os.path.join(*parts) for parts in paths]]
+        actual = [os.path.normpath(g) for g in self.glob(*patterns)]
+        self.assertSequencesEqual_noorder(actual, expected)
+
+    def test_two_terms(self):
+        self.match_pattern_with_results(['a{aa,ab}'], [["aaa"], ["aab"]])
+
+    def test_missing_first_plus_nested(self):
+        self.match_pattern_with_results(['a{,a{a,b}}'], [['a'], ['aaa'], ['aab']])
+
+    def test_one_subpath_with_two_file_terms(self):
+        self.match_pattern_with_results(['a', '{D,bcd}'], [['a', 'D'], ['a', 'bcd']])
+
+    def test_two_subpath_terms_with_two_file_terms(self):
+        self.match_pattern_with_results(['{aaa,aab}', '{F,zzzF}'], [('aaa', 'zzzF'), ('aab', 'F')])
+
+    def test_two_subpath_terms_with_wildcard_file_term(self):
+        self.match_pattern_with_results(['aa{a,b}', '*F'], [('aaa', 'zzzF'), ('aab', 'F')])
+
+    def test_wildcard_subpath_with_file_missing_first_term(self):
+        self.match_pattern_with_results(['aa?', '{,zzz}F'], [('aaa', 'zzzF'), ('aab', 'F')])
+
+    #
+    # Edge cases where braces should not be expanded
+    #
+    def test_empty_braces(self):
+        self.assertSequencesEqual_noorder(self.glob('c{}d'), [self.norm('c{}d')])
+
+    def test_missing_end_brace(self):
+        self.assertSequencesEqual_noorder(self.glob('c{d{e,f}g'), map(self.norm, ['c{deg', 'c{dfg']))
+
+    def test_second_brace_one_term(self):
+        self.assertSequencesEqual_noorder(self.glob('c{d,e}{f}g'), map(self.norm, ['cd{f}g', 'ce{f}g']))
+
+    def test_outer_term_missing_first_brace(self):
+        self.assertSequencesEqual_noorder(self.glob('c{d,e}f}g'), map(self.norm, ['cdf}g', 'cef}g']))
+
+    #
+    # Braces containing folder separators
+    #
+    def test_embedded_separator1(self):
+        self.match_pattern_with_results(['a/{D,bcd/{EF,efg}}'], [('a', 'D'), ('a', 'bcd', 'EF'), ('a', 'bcd', 'efg')])
+
+    def test_embedded_separator2(self):
+        self.match_pattern_with_results(['aa{a/zzz,b/}F'], [('aaa', 'zzzF'), ('aab', 'F')])
 
 def test_main():
-    run_unittest(GlobTests)
+    run_unittest(GlobTests, GlobBracesTests)
 
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9584: glob.glob now expands braces to a list of strings.
+  Original patch by Mathieu Bridon.
+
 - Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
   characters when used with the 'replace' error handler on invalid utf-8
   sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.

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

From python-checkins at python.org  Tue Nov  6 14:56:03 2012
From: python-checkins at python.org (tim.golden)
Date: Tue,  6 Nov 2012 14:56:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Correct_mis-indented_white?=
	=?utf-8?q?space?=
Message-ID: <3Xwsjc00B0zNQP@mail.python.org>

http://hg.python.org/cpython/rev/5cf6c427fd39
changeset:   80274:5cf6c427fd39
user:        Tim Golden <mail at timgolden.me.uk>
date:        Tue Nov 06 13:55:42 2012 +0000
summary:
  Correct mis-indented whitespace

files:
  Lib/glob.py |  30 +++++++++++++++---------------
  1 files changed, 15 insertions(+), 15 deletions(-)


diff --git a/Lib/glob.py b/Lib/glob.py
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -27,22 +27,22 @@
         return
     pathnames = expand_braces(pathname)
     for pathname in pathnames:
-      dirname, basename = os.path.split(pathname)
-      if not dirname:
-          yield from glob1(None, basename)
-          return
+        dirname, basename = os.path.split(pathname)
+        if not dirname:
+            yield from glob1(None, basename)
+            return
 
-      if has_magic(dirname):
-          dirs = iglob(dirname)
-      else:
-          dirs = [dirname]
-      if has_magic(basename):
-          glob_in_dir = glob1
-      else:
-          glob_in_dir = glob0
-      for dirname in dirs:
-          for name in glob_in_dir(dirname, basename):
-              yield os.path.join(dirname, name)
+        if has_magic(dirname):
+            dirs = iglob(dirname)
+        else:
+            dirs = [dirname]
+        if has_magic(basename):
+            glob_in_dir = glob1
+        else:
+            glob_in_dir = glob0
+        for dirname in dirs:
+            for name in glob_in_dir(dirname, basename):
+                yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`

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

From python-checkins at python.org  Tue Nov  6 16:24:16 2012
From: python-checkins at python.org (marc-andre.lemburg)
Date: Tue,  6 Nov 2012 16:24:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Clarify_the_meaning_of_=22num?=
 =?utf-8?q?ber_of_affected_rows=22_in_the_DB-API_2=2E0?=
Message-ID: <3XwvgN6c7QzLqN@mail.python.org>

http://hg.python.org/peps/rev/888c87639210
changeset:   4577:888c87639210
user:        Marc-Andre Lemburg <mal at egenix.com>
date:        Tue Nov 06 16:24:07 2012 +0100
summary:
  Clarify the meaning of "number of affected rows" in the DB-API 2.0
as discussed on the db-sig list.

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


diff --git a/pep-0249.txt b/pep-0249.txt
--- a/pep-0249.txt
+++ b/pep-0249.txt
@@ -1,7 +1,7 @@
 PEP: 249
 Title: Python Database API Specification v2.0
-Version: $Revision$
-Last-Modified: $Date$
+Version: $Revision: 56119 $
+Last-Modified: $Date: 2007-06-28 22:11:32 +0200 (Thu, 28 Jun 2007) $
 Author: mal at lemburg.com (Marc-Andr? Lemburg)
 Discussions-To: db-sig at python.org
 Status: Final
@@ -287,7 +287,7 @@
             This read-only attribute specifies the number of rows that
             the last .execute*() produced (for DQL statements like
             'select') or affected (for DML statements like 'update' or
-            'insert'). [9]
+            'insert').
             
             The attribute is -1 in case no .execute*() has been
             performed on the cursor or the rowcount of the last
@@ -1127,20 +1127,6 @@
         implement the tp_iter slot on the cursor object instead of the
         .__iter__() method.
 
-    [9] The term "number of affected rows" generally refers to the
-        number of rows deleted, updated or inserted by the last
-        statement run on the database cursor. Most databases will
-        return the total number of rows that were found by the
-        corresponding WHERE clause of the statement. Some databases
-        use a different interpretation for UPDATEs and only return the
-        number of rows that were changed by the UPDATE, even though
-        the WHERE clause of the statement may have found more matching
-        rows. Database module authors should try to implement the more
-        common interpretation of returning the total number of rows
-        found by the WHERE clause, or clearly document a different
-        interpretation of the rowcount attribute.
-
-
 Acknowledgements
 
     Many thanks go to Andrew Kuchling who converted the Python

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

From python-checkins at python.org  Tue Nov  6 16:38:23 2012
From: python-checkins at python.org (tim.golden)
Date: Tue,  6 Nov 2012 16:38:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Backed_out_changeset_5cf6c?=
	=?utf-8?q?427fd39?=
Message-ID: <3Xwvzg03bZzLvs@mail.python.org>

http://hg.python.org/cpython/rev/7065056aa30e
changeset:   80275:7065056aa30e
user:        Tim Golden <mail at timgolden.me.uk>
date:        Tue Nov 06 15:32:50 2012 +0000
summary:
  Backed out changeset 5cf6c427fd39

files:
  Lib/glob.py |  30 +++++++++++++++---------------
  1 files changed, 15 insertions(+), 15 deletions(-)


diff --git a/Lib/glob.py b/Lib/glob.py
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -27,22 +27,22 @@
         return
     pathnames = expand_braces(pathname)
     for pathname in pathnames:
-        dirname, basename = os.path.split(pathname)
-        if not dirname:
-            yield from glob1(None, basename)
-            return
+      dirname, basename = os.path.split(pathname)
+      if not dirname:
+          yield from glob1(None, basename)
+          return
 
-        if has_magic(dirname):
-            dirs = iglob(dirname)
-        else:
-            dirs = [dirname]
-        if has_magic(basename):
-            glob_in_dir = glob1
-        else:
-            glob_in_dir = glob0
-        for dirname in dirs:
-            for name in glob_in_dir(dirname, basename):
-                yield os.path.join(dirname, name)
+      if has_magic(dirname):
+          dirs = iglob(dirname)
+      else:
+          dirs = [dirname]
+      if has_magic(basename):
+          glob_in_dir = glob1
+      else:
+          glob_in_dir = glob0
+      for dirname in dirs:
+          for name in glob_in_dir(dirname, basename):
+              yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`

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

From python-checkins at python.org  Tue Nov  6 16:38:24 2012
From: python-checkins at python.org (tim.golden)
Date: Tue,  6 Nov 2012 16:38:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Backed_out_changeset_dafca?=
	=?utf-8?q?4714298?=
Message-ID: <3Xwvzh3hDbzMQy@mail.python.org>

http://hg.python.org/cpython/rev/a29f15f743a2
changeset:   80276:a29f15f743a2
parent:      80273:dafca4714298
user:        Tim Golden <mail at timgolden.me.uk>
date:        Tue Nov 06 15:33:30 2012 +0000
summary:
  Backed out changeset dafca4714298

files:
  Doc/library/glob.rst  |  11 ++--
  Lib/glob.py           |  65 ++++++++----------------------
  Lib/test/test_glob.py |  64 +-----------------------------
  Misc/NEWS             |   3 -
  4 files changed, 25 insertions(+), 118 deletions(-)


diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -13,10 +13,10 @@
 
 The :mod:`glob` module finds all the pathnames matching a specified pattern
 according to the rules used by the Unix shell.  No tilde expansion is done, but
-``*``, ``?``, character ranges expressed with ``[]`` and list of options
-expressed with ``{}`` will be correctly matched.  This is done by using the
-:func:`os.listdir` and :func:`fnmatch.fnmatch` functions in concert, and not by
-actually invoking a subshell.  (For tilde and shell variable expansion, use
+``*``, ``?``, and character ranges expressed with ``[]`` will be correctly
+matched.  This is done by using the :func:`os.listdir` and
+:func:`fnmatch.fnmatch` functions in concert, and not by actually invoking a
+subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
 
@@ -47,8 +47,7 @@
    ['1.gif', 'card.gif']
    >>> glob.glob('?.gif')
    ['1.gif']
-   >>> glob.glob('?.{gif,txt}')
-   ['1.gif', '2.txt']
+
 
 .. seealso::
 
diff --git a/Lib/glob.py b/Lib/glob.py
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -14,7 +14,6 @@
     """
     return list(iglob(pathname))
 
-
 def iglob(pathname):
     """Return an iterator which yields the paths matching a pathname pattern.
 
@@ -25,24 +24,21 @@
         if os.path.lexists(pathname):
             yield pathname
         return
-    pathnames = expand_braces(pathname)
-    for pathname in pathnames:
-      dirname, basename = os.path.split(pathname)
-      if not dirname:
-          yield from glob1(None, basename)
-          return
-
-      if has_magic(dirname):
-          dirs = iglob(dirname)
-      else:
-          dirs = [dirname]
-      if has_magic(basename):
-          glob_in_dir = glob1
-      else:
-          glob_in_dir = glob0
-      for dirname in dirs:
-          for name in glob_in_dir(dirname, basename):
-              yield os.path.join(dirname, name)
+    dirname, basename = os.path.split(pathname)
+    if not dirname:
+        yield from glob1(None, basename)
+        return
+    if has_magic(dirname):
+        dirs = iglob(dirname)
+    else:
+        dirs = [dirname]
+    if has_magic(basename):
+        glob_in_dir = glob1
+    else:
+        glob_in_dir = glob0
+    for dirname in dirs:
+        for name in glob_in_dir(dirname, basename):
+            yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`
@@ -74,37 +70,12 @@
     return []
 
 
-magic_check = re.compile('[*?[{]')
-magic_check_bytes = re.compile(b'[*?[{]')
+magic_check = re.compile('[*?[]')
+magic_check_bytes = re.compile(b'[*?[]')
+
 def has_magic(s):
     if isinstance(s, bytes):
         match = magic_check_bytes.search(s)
     else:
         match = magic_check.search(s)
     return match is not None
-
-brace_matcher = re.compile(r'.*(\{.+?[^\\]\})')
-def expand_braces(text):
-    """Find the rightmost, innermost set of braces and, if it contains a
-    comma-separated list, expand its contents recursively (any of its items
-    may itself be a list enclosed in braces).
-
-    Return the full set of expanded strings.
-    """
-    res = set()
-
-    match = brace_matcher.search(text)
-    if match is not None:
-        sub = match.group(1)
-        open_brace, close_brace = match.span(1)
-        if "," in sub:
-            for pat in sub.strip('{}').split(','):
-                res.update(expand_braces(text[:open_brace] + pat + text[close_brace:]))
-
-        else:
-            res.update(expand_braces(text[:open_brace] + sub.replace('}', '\\}') + text[close_brace:]))
-
-    else:
-        res.add(text.replace('\\}', '}'))
-
-    return res
diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -5,7 +5,7 @@
 import os
 import shutil
 
-class GlobTestsBase(unittest.TestCase):
+class GlobTests(unittest.TestCase):
 
     def norm(self, *parts):
         return os.path.normpath(os.path.join(self.tempdir, *parts))
@@ -45,8 +45,6 @@
     def assertSequencesEqual_noorder(self, l1, l2):
         self.assertEqual(set(l1), set(l2))
 
-class GlobTests(GlobTestsBase):
-
     def test_glob_literal(self):
         eq = self.assertSequencesEqual_noorder
         eq(self.glob('a'), [self.norm('a')])
@@ -107,67 +105,9 @@
         eq(self.glob('sym1'), [self.norm('sym1')])
         eq(self.glob('sym2'), [self.norm('sym2')])
 
-class GlobBracesTests(GlobTestsBase):
-
-    def setUp(self):
-        super(GlobBracesTests, self).setUp()
-        self.mktemp('c{}d')
-        self.mktemp('c{deg')
-        self.mktemp('c{dfg')
-        self.mktemp('cd{f}g')
-        self.mktemp('ce{f}g')
-        self.mktemp('cdf}g')
-        self.mktemp('cef}g')
-
-    def match_pattern_with_results(self, patterns, paths):
-        expected = [self.norm(path) for path in [os.path.join(*parts) for parts in paths]]
-        actual = [os.path.normpath(g) for g in self.glob(*patterns)]
-        self.assertSequencesEqual_noorder(actual, expected)
-
-    def test_two_terms(self):
-        self.match_pattern_with_results(['a{aa,ab}'], [["aaa"], ["aab"]])
-
-    def test_missing_first_plus_nested(self):
-        self.match_pattern_with_results(['a{,a{a,b}}'], [['a'], ['aaa'], ['aab']])
-
-    def test_one_subpath_with_two_file_terms(self):
-        self.match_pattern_with_results(['a', '{D,bcd}'], [['a', 'D'], ['a', 'bcd']])
-
-    def test_two_subpath_terms_with_two_file_terms(self):
-        self.match_pattern_with_results(['{aaa,aab}', '{F,zzzF}'], [('aaa', 'zzzF'), ('aab', 'F')])
-
-    def test_two_subpath_terms_with_wildcard_file_term(self):
-        self.match_pattern_with_results(['aa{a,b}', '*F'], [('aaa', 'zzzF'), ('aab', 'F')])
-
-    def test_wildcard_subpath_with_file_missing_first_term(self):
-        self.match_pattern_with_results(['aa?', '{,zzz}F'], [('aaa', 'zzzF'), ('aab', 'F')])
-
-    #
-    # Edge cases where braces should not be expanded
-    #
-    def test_empty_braces(self):
-        self.assertSequencesEqual_noorder(self.glob('c{}d'), [self.norm('c{}d')])
-
-    def test_missing_end_brace(self):
-        self.assertSequencesEqual_noorder(self.glob('c{d{e,f}g'), map(self.norm, ['c{deg', 'c{dfg']))
-
-    def test_second_brace_one_term(self):
-        self.assertSequencesEqual_noorder(self.glob('c{d,e}{f}g'), map(self.norm, ['cd{f}g', 'ce{f}g']))
-
-    def test_outer_term_missing_first_brace(self):
-        self.assertSequencesEqual_noorder(self.glob('c{d,e}f}g'), map(self.norm, ['cdf}g', 'cef}g']))
-
-    #
-    # Braces containing folder separators
-    #
-    def test_embedded_separator1(self):
-        self.match_pattern_with_results(['a/{D,bcd/{EF,efg}}'], [('a', 'D'), ('a', 'bcd', 'EF'), ('a', 'bcd', 'efg')])
-
-    def test_embedded_separator2(self):
-        self.match_pattern_with_results(['aa{a/zzz,b/}F'], [('aaa', 'zzzF'), ('aab', 'F')])
 
 def test_main():
-    run_unittest(GlobTests, GlobBracesTests)
+    run_unittest(GlobTests)
 
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,9 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #9584: glob.glob now expands braces to a list of strings.
-  Original patch by Mathieu Bridon.
-
 - Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
   characters when used with the 'replace' error handler on invalid utf-8
   sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.

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

From python-checkins at python.org  Tue Nov  6 16:38:26 2012
From: python-checkins at python.org (tim.golden)
Date: Tue,  6 Nov 2012 16:38:26 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
 =?utf-8?q?=29=3A_Reversed_changes_from_issue9584?=
Message-ID: <3Xwvzk05kdzM34@mail.python.org>

http://hg.python.org/cpython/rev/ec897bb38708
changeset:   80277:ec897bb38708
parent:      80275:7065056aa30e
parent:      80276:a29f15f743a2
user:        Tim Golden <mail at timgolden.me.uk>
date:        Tue Nov 06 15:34:23 2012 +0000
summary:
  Reversed changes from issue9584

files:
  Doc/library/glob.rst  |  11 ++--
  Lib/glob.py           |  65 ++++++++----------------------
  Lib/test/test_glob.py |  64 +-----------------------------
  Misc/NEWS             |   3 -
  4 files changed, 25 insertions(+), 118 deletions(-)


diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -13,10 +13,10 @@
 
 The :mod:`glob` module finds all the pathnames matching a specified pattern
 according to the rules used by the Unix shell.  No tilde expansion is done, but
-``*``, ``?``, character ranges expressed with ``[]`` and list of options
-expressed with ``{}`` will be correctly matched.  This is done by using the
-:func:`os.listdir` and :func:`fnmatch.fnmatch` functions in concert, and not by
-actually invoking a subshell.  (For tilde and shell variable expansion, use
+``*``, ``?``, and character ranges expressed with ``[]`` will be correctly
+matched.  This is done by using the :func:`os.listdir` and
+:func:`fnmatch.fnmatch` functions in concert, and not by actually invoking a
+subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
 
@@ -47,8 +47,7 @@
    ['1.gif', 'card.gif']
    >>> glob.glob('?.gif')
    ['1.gif']
-   >>> glob.glob('?.{gif,txt}')
-   ['1.gif', '2.txt']
+
 
 .. seealso::
 
diff --git a/Lib/glob.py b/Lib/glob.py
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -14,7 +14,6 @@
     """
     return list(iglob(pathname))
 
-
 def iglob(pathname):
     """Return an iterator which yields the paths matching a pathname pattern.
 
@@ -25,24 +24,21 @@
         if os.path.lexists(pathname):
             yield pathname
         return
-    pathnames = expand_braces(pathname)
-    for pathname in pathnames:
-      dirname, basename = os.path.split(pathname)
-      if not dirname:
-          yield from glob1(None, basename)
-          return
-
-      if has_magic(dirname):
-          dirs = iglob(dirname)
-      else:
-          dirs = [dirname]
-      if has_magic(basename):
-          glob_in_dir = glob1
-      else:
-          glob_in_dir = glob0
-      for dirname in dirs:
-          for name in glob_in_dir(dirname, basename):
-              yield os.path.join(dirname, name)
+    dirname, basename = os.path.split(pathname)
+    if not dirname:
+        yield from glob1(None, basename)
+        return
+    if has_magic(dirname):
+        dirs = iglob(dirname)
+    else:
+        dirs = [dirname]
+    if has_magic(basename):
+        glob_in_dir = glob1
+    else:
+        glob_in_dir = glob0
+    for dirname in dirs:
+        for name in glob_in_dir(dirname, basename):
+            yield os.path.join(dirname, name)
 
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`
@@ -74,37 +70,12 @@
     return []
 
 
-magic_check = re.compile('[*?[{]')
-magic_check_bytes = re.compile(b'[*?[{]')
+magic_check = re.compile('[*?[]')
+magic_check_bytes = re.compile(b'[*?[]')
+
 def has_magic(s):
     if isinstance(s, bytes):
         match = magic_check_bytes.search(s)
     else:
         match = magic_check.search(s)
     return match is not None
-
-brace_matcher = re.compile(r'.*(\{.+?[^\\]\})')
-def expand_braces(text):
-    """Find the rightmost, innermost set of braces and, if it contains a
-    comma-separated list, expand its contents recursively (any of its items
-    may itself be a list enclosed in braces).
-
-    Return the full set of expanded strings.
-    """
-    res = set()
-
-    match = brace_matcher.search(text)
-    if match is not None:
-        sub = match.group(1)
-        open_brace, close_brace = match.span(1)
-        if "," in sub:
-            for pat in sub.strip('{}').split(','):
-                res.update(expand_braces(text[:open_brace] + pat + text[close_brace:]))
-
-        else:
-            res.update(expand_braces(text[:open_brace] + sub.replace('}', '\\}') + text[close_brace:]))
-
-    else:
-        res.add(text.replace('\\}', '}'))
-
-    return res
diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -5,7 +5,7 @@
 import os
 import shutil
 
-class GlobTestsBase(unittest.TestCase):
+class GlobTests(unittest.TestCase):
 
     def norm(self, *parts):
         return os.path.normpath(os.path.join(self.tempdir, *parts))
@@ -45,8 +45,6 @@
     def assertSequencesEqual_noorder(self, l1, l2):
         self.assertEqual(set(l1), set(l2))
 
-class GlobTests(GlobTestsBase):
-
     def test_glob_literal(self):
         eq = self.assertSequencesEqual_noorder
         eq(self.glob('a'), [self.norm('a')])
@@ -107,67 +105,9 @@
         eq(self.glob('sym1'), [self.norm('sym1')])
         eq(self.glob('sym2'), [self.norm('sym2')])
 
-class GlobBracesTests(GlobTestsBase):
-
-    def setUp(self):
-        super(GlobBracesTests, self).setUp()
-        self.mktemp('c{}d')
-        self.mktemp('c{deg')
-        self.mktemp('c{dfg')
-        self.mktemp('cd{f}g')
-        self.mktemp('ce{f}g')
-        self.mktemp('cdf}g')
-        self.mktemp('cef}g')
-
-    def match_pattern_with_results(self, patterns, paths):
-        expected = [self.norm(path) for path in [os.path.join(*parts) for parts in paths]]
-        actual = [os.path.normpath(g) for g in self.glob(*patterns)]
-        self.assertSequencesEqual_noorder(actual, expected)
-
-    def test_two_terms(self):
-        self.match_pattern_with_results(['a{aa,ab}'], [["aaa"], ["aab"]])
-
-    def test_missing_first_plus_nested(self):
-        self.match_pattern_with_results(['a{,a{a,b}}'], [['a'], ['aaa'], ['aab']])
-
-    def test_one_subpath_with_two_file_terms(self):
-        self.match_pattern_with_results(['a', '{D,bcd}'], [['a', 'D'], ['a', 'bcd']])
-
-    def test_two_subpath_terms_with_two_file_terms(self):
-        self.match_pattern_with_results(['{aaa,aab}', '{F,zzzF}'], [('aaa', 'zzzF'), ('aab', 'F')])
-
-    def test_two_subpath_terms_with_wildcard_file_term(self):
-        self.match_pattern_with_results(['aa{a,b}', '*F'], [('aaa', 'zzzF'), ('aab', 'F')])
-
-    def test_wildcard_subpath_with_file_missing_first_term(self):
-        self.match_pattern_with_results(['aa?', '{,zzz}F'], [('aaa', 'zzzF'), ('aab', 'F')])
-
-    #
-    # Edge cases where braces should not be expanded
-    #
-    def test_empty_braces(self):
-        self.assertSequencesEqual_noorder(self.glob('c{}d'), [self.norm('c{}d')])
-
-    def test_missing_end_brace(self):
-        self.assertSequencesEqual_noorder(self.glob('c{d{e,f}g'), map(self.norm, ['c{deg', 'c{dfg']))
-
-    def test_second_brace_one_term(self):
-        self.assertSequencesEqual_noorder(self.glob('c{d,e}{f}g'), map(self.norm, ['cd{f}g', 'ce{f}g']))
-
-    def test_outer_term_missing_first_brace(self):
-        self.assertSequencesEqual_noorder(self.glob('c{d,e}f}g'), map(self.norm, ['cdf}g', 'cef}g']))
-
-    #
-    # Braces containing folder separators
-    #
-    def test_embedded_separator1(self):
-        self.match_pattern_with_results(['a/{D,bcd/{EF,efg}}'], [('a', 'D'), ('a', 'bcd', 'EF'), ('a', 'bcd', 'efg')])
-
-    def test_embedded_separator2(self):
-        self.match_pattern_with_results(['aa{a/zzz,b/}F'], [('aaa', 'zzzF'), ('aab', 'F')])
 
 def test_main():
-    run_unittest(GlobTests, GlobBracesTests)
+    run_unittest(GlobTests)
 
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,9 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #9584: glob.glob now expands braces to a list of strings.
-  Original patch by Mathieu Bridon.
-
 - Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
   characters when used with the 'replace' error handler on invalid utf-8
   sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.

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

From python-checkins at python.org  Tue Nov  6 23:23:28 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue,  6 Nov 2012 23:23:28 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316414=3A_Add_supp?=
 =?utf-8?q?ort=2EFS=5FNONASCII_and_support=2ETESTFN=5FNONASCII?=
Message-ID: <3Xx4z42lcszMGY@mail.python.org>

http://hg.python.org/cpython/rev/de8cf1ece068
changeset:   80278:de8cf1ece068
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Nov 06 23:23:43 2012 +0100
summary:
  Issue #16414: Add support.FS_NONASCII and support.TESTFN_NONASCII

These constants are used to test functions with non-ASCII data, especially
filenames.

files:
  Lib/test/support.py              |  31 ++++++++++++++++++++
  Lib/test/test_cmd_line.py        |   6 +-
  Lib/test/test_cmd_line_script.py |  11 +-----
  Lib/test/test_genericpath.py     |   2 +
  Lib/test/test_os.py              |   4 ++
  5 files changed, 42 insertions(+), 12 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -603,6 +603,32 @@
 # module name.
 TESTFN = "{}_{}_tmp".format(TESTFN, os.getpid())
 
+# FS_NONASCII: non-ASCII character encodable by os.fsencode(),
+# or None if there is no such character.
+FS_NONASCII = None
+for character in (
+    # U+00E6 (Latin small letter AE): Encodable to cp1252, cp1254, cp1257, iso-8859-1
+    '\u00E6',
+    # U+0141 (Latin capital letter L with stroke): Encodable to cp1250, cp1257
+    '\u0141',
+    # U+041A (Cyrillic capital letter KA): Encodable to cp932, cp950, cp1251
+    '\u041A',
+    # U+05D0 (Hebrew Letter Alef): Encodable to cp424, cp1255
+    '\u05D0',
+    # U+06A9 (Arabic letter KEHEH): Encodable to cp1256
+    '\u06A9',
+    # U+03A9 (Greek capital letter OMEGA): Encodable to cp932, cp950, cp1253
+    '\u03A9',
+    # U+0E01 (Thai character KO KAI): Encodable to cp874
+    '\u0E01',
+):
+    try:
+        os.fsdecode(os.fsencode(character))
+    except UnicodeError:
+        pass
+    else:
+        FS_NONASCII = character
+        break
 
 # TESTFN_UNICODE is a non-ascii filename
 TESTFN_UNICODE = TESTFN + "-\xe0\xf2\u0258\u0141\u011f"
@@ -658,6 +684,11 @@
         TESTFN_UNDECODABLE = name
         break
 
+if FS_NONASCII:
+    TESTFN_NONASCII = TESTFN + '- ' + FS_NONASCII
+else:
+    TESTFN_NONASCII = None
+
 # Save the initial cwd
 SAVEDCWD = os.getcwd()
 
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -93,15 +93,15 @@
         # All good if execution is successful
         assert_python_ok('-c', 'pass')
 
-    @unittest.skipIf(sys.getfilesystemencoding() == 'ascii',
-                     'need a filesystem encoding different than ASCII')
+    @unittest.skipUnless(test.support.FS_NONASCII, 'need support.FS_NONASCII')
     def test_non_ascii(self):
         # Test handling of non-ascii data
         if test.support.verbose:
             import locale
             print('locale encoding = %s, filesystem encoding = %s'
                   % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
-        command = "assert(ord('\xe9') == 0xe9)"
+        command = ("assert(ord(%r) == %s)"
+                   % (test.support.FS_NONASCII, ord(test.support.FS_NONASCII)))
         assert_python_ok('-c', command)
 
     # On Windows, pass bytes to subprocess doesn't test how Python decodes the
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,19 +363,12 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
+    @unittest.skipUnless(support.TESTFN_NONASCII, 'need support.TESTFN_NONASCII')
     def test_non_ascii(self):
         # Issue #16218
         # non-ascii filename encodable to cp1252, cp932, latin1 and utf8
-        filename = support.TESTFN + '\xa3'
-        try:
-            os.fsencode(filename)
-        except UnicodeEncodeError:
-            self.skipTest(
-                "Filesystem encoding %r cannot encode "
-                "the filename: %a"
-                % (sys.getfilesystemencoding(), filename))
         source = 'print(ascii(__file__))\n'
-        script_name = _make_test_script(os.curdir, filename, source)
+        script_name = _make_test_script(os.curdir, support.TESTFN_NONASCII, source)
         self.addCleanup(support.unlink, script_name)
         rc, stdout, stderr = assert_python_ok(script_name)
         self.assertEqual(
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -313,6 +313,8 @@
     def test_nonascii_abspath(self):
         if support.TESTFN_UNDECODABLE:
             name = support.TESTFN_UNDECODABLE
+        elif support.TESTFN_NONASCII:
+            name = support.TESTFN_NONASCII
         else:
             name = b'a\xffb\xe7w\xf0'
 
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
@@ -1243,6 +1243,8 @@
         def setUp(self):
             if support.TESTFN_UNENCODABLE:
                 self.dir = support.TESTFN_UNENCODABLE
+            elif support.TESTFN_NONASCII:
+                self.dir = support.TESTFN_NONASCII
             else:
                 self.dir = support.TESTFN
             self.bdir = os.fsencode(self.dir)
@@ -1257,6 +1259,8 @@
             add_filename(support.TESTFN_UNICODE)
             if support.TESTFN_UNENCODABLE:
                 add_filename(support.TESTFN_UNENCODABLE)
+            if support.TESTFN_NONASCII:
+                add_filename(support.TESTFN_NONASCII)
             if not bytesfn:
                 self.skipTest("couldn't create any non-ascii filename")
 

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

From python-checkins at python.org  Tue Nov  6 23:33:32 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue,  6 Nov 2012 23:33:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316414=3A_Fix_supp?=
 =?utf-8?q?ort=2ETESTFN=5FUNDECODABLE_and?=
Message-ID: <3Xx5Bh70Z4zMH5@mail.python.org>

http://hg.python.org/cpython/rev/0e9fbdda3c92
changeset:   80279:0e9fbdda3c92
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Nov 06 23:33:46 2012 +0100
summary:
  Issue #16414: Fix support.TESTFN_UNDECODABLE and test_genericpath.test_nonascii_abspath()

 * support.TESTFN_UNDECODABLE was decodable if the filesystem encoding was
   cp932
 * test_genericpath.test_nonascii_abspath() didn't work on Windows if the
   path was not decodable (ex: with cp932)

files:
  Lib/test/support.py          |   6 ++++-
  Lib/test/test_genericpath.py |  27 ++++++++++++++++-------
  2 files changed, 24 insertions(+), 9 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -677,7 +677,11 @@
 # decoded from the filesystem encoding (in strict mode). It can be None if we
 # cannot generate such filename.
 TESTFN_UNDECODABLE = None
-for name in (b'abc\xff', b'\xe7w\xf0'):
+# b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
+# accepts it to create a file or a directory, or don't accept to enter to
+# such directory (when the bytes name is used). So test b'\xe7' first: it is
+# not decodable from cp932.
+for name in (b'\xe7w\xf0', b'abc\xff'):
     try:
         os.fsdecode(name)
     except UnicodeDecodeError:
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -308,17 +308,28 @@
                 for path in ('', 'fuu', 'f\xf9\xf9', '/fuu', 'U:\\'):
                     self.assertIsInstance(abspath(path), str)
 
-    @unittest.skipIf(sys.platform == 'darwin',
-        "Mac OS X denies the creation of a directory with an invalid utf8 name")
     def test_nonascii_abspath(self):
-        if support.TESTFN_UNDECODABLE:
-            name = support.TESTFN_UNDECODABLE
-        elif support.TESTFN_NONASCII:
-            name = support.TESTFN_NONASCII
+        # Test non-ASCII in the path
+        if sys.platform in ('win32', 'darwin'):
+            if support.TESTFN_NONASCII:
+                name = support.TESTFN_NONASCII
+            else:
+                # Mac OS X denies the creation of a directory with an invalid
+                # UTF-8 name. Windows allows to create a directory with an
+                # arbitrary bytes name, but fails to enter this directory
+                # (when the bytes name is used).
+                self.skipTest("need support.TESTFN_NONASCII")
         else:
-            name = b'a\xffb\xe7w\xf0'
+            if support.TESTFN_UNDECODABLE:
+                name = support.TESTFN_UNDECODABLE
+            elif support.TESTFN_NONASCII:
+                name = support.TESTFN_NONASCII
+            else:
+                # On UNIX, the surrogateescape error handler is used to
+                # decode paths, so any byte is allowed, it does not depend
+                # on the locale
+                name = b'a\xffb\xe7w\xf0'
 
-        # Test non-ASCII, non-UTF8 bytes in the path.
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
             with support.temp_cwd(name):

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

From python-checkins at python.org  Tue Nov  6 23:40:07 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue,  6 Nov 2012 23:40:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316414=3A_Fix_typo?=
 =?utf-8?q?_in_support=2ETESTFN=5FNONASCII_=28useless_space=29?=
Message-ID: <3Xx5LH6DlVzMG3@mail.python.org>

http://hg.python.org/cpython/rev/55710b8c6670
changeset:   80280:55710b8c6670
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Nov 06 23:40:22 2012 +0100
summary:
  Issue #16414: Fix typo in support.TESTFN_NONASCII (useless space)

files:
  Lib/test/support.py |  2 +-
  1 files changed, 1 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
@@ -689,7 +689,7 @@
         break
 
 if FS_NONASCII:
-    TESTFN_NONASCII = TESTFN + '- ' + FS_NONASCII
+    TESTFN_NONASCII = TESTFN + '-' + FS_NONASCII
 else:
     TESTFN_NONASCII = None
 

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

From python-checkins at python.org  Tue Nov  6 23:43:06 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue,  6 Nov 2012 23:43:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316414=3A_Test_mor?=
 =?utf-8?q?e_characters_for_support=2EFS=5FNONASCII?=
Message-ID: <3Xx5Pk28w9zMG3@mail.python.org>

http://hg.python.org/cpython/rev/7f90305d9f23
changeset:   80281:7f90305d9f23
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Nov 06 23:43:21 2012 +0100
summary:
  Issue #16414: Test more characters for support.FS_NONASCII

It should increase the probability of finding a non-ASCII character on any
locale encoding.

files:
  Lib/test/support.py |  35 ++++++++++++++++++++++++--------
  1 files changed, 26 insertions(+), 9 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -607,20 +607,37 @@
 # or None if there is no such character.
 FS_NONASCII = None
 for character in (
-    # U+00E6 (Latin small letter AE): Encodable to cp1252, cp1254, cp1257, iso-8859-1
+    # First try printable and common characters to have a readable filename.
+    # For each character, the encoding list are just example of encodings able
+    # to encode the character (the list is not exhaustive).
+
+    # U+00E6 (Latin Small Letter Ae): cp1252, iso-8859-1
     '\u00E6',
-    # U+0141 (Latin capital letter L with stroke): Encodable to cp1250, cp1257
+    # U+0130 (Latin Capital Letter I With Dot Above): cp1254, iso8859_3
+    '\u0130',
+    # U+0141 (Latin Capital Letter L With Stroke): cp1250, cp1257
     '\u0141',
-    # U+041A (Cyrillic capital letter KA): Encodable to cp932, cp950, cp1251
+    # U+03C6 (Greek Small Letter Phi): cp1253
+    '\u03C6',
+    # U+041A (Cyrillic Capital Letter Ka): cp1251
     '\u041A',
-    # U+05D0 (Hebrew Letter Alef): Encodable to cp424, cp1255
+    # U+05D0 (Hebrew Letter Alef): Encodable to cp424
     '\u05D0',
-    # U+06A9 (Arabic letter KEHEH): Encodable to cp1256
-    '\u06A9',
-    # U+03A9 (Greek capital letter OMEGA): Encodable to cp932, cp950, cp1253
-    '\u03A9',
-    # U+0E01 (Thai character KO KAI): Encodable to cp874
+    # U+060C (Arabic Comma): cp864, cp1006, iso8859_6, mac_arabic
+    '\u060C',
+    # U+062A (Arabic Letter Teh): cp720
+    '\u062A',
+    # U+0E01 (Thai Character Ko Kai): cp874
     '\u0E01',
+
+    # Then try more "special" characters. "special" because they may be
+    # interpreted or displayed differently depending on the exact locale
+    # encoding and the font.
+
+    # U+00A0 (No-Break Space)
+    '\u00A0',
+    # U+20AC (Euro Sign)
+    '\u20AC',
 ):
     try:
         os.fsdecode(os.fsencode(character))

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

From python-checkins at python.org  Tue Nov  6 23:56:36 2012
From: python-checkins at python.org (stefan.krah)
Date: Tue,  6 Nov 2012 23:56:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Backport_fc8f1?=
	=?utf-8?q?b1c76bf=2E?=
Message-ID: <3Xx5jJ4jzVzMH5@mail.python.org>

http://hg.python.org/cpython/rev/55cc29d7e83a
changeset:   80282:55cc29d7e83a
branch:      3.3
parent:      80271:e99e7e2f61d2
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Nov 06 23:27:24 2012 +0100
summary:
  Backport fc8f1b1c76bf.

files:
  Lib/test/test_buffer.py |  20 +++++---------------
  1 files changed, 5 insertions(+), 15 deletions(-)


diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
--- a/Lib/test/test_buffer.py
+++ b/Lib/test/test_buffer.py
@@ -4001,23 +4001,13 @@
 
         # equality-hash invariant
         x = ndarray(list(range(12)), shape=[12], format='B')
-        a = memoryview(nd)
+        a = memoryview(x)
 
         y = ndarray(list(range(12)), shape=[12], format='b')
-        b = memoryview(nd)
-
-        z = ndarray(list(bytes(chr(x), 'latin-1') for x in range(12)),
-                    shape=[12], format='c')
-        c = memoryview(nd)
-
-        if (a == b):
-            self.assertEqual(hash(a), hash(b))
-
-        if (a == c):
-            self.assertEqual(hash(a), hash(c))
-
-        if (b == c):
-            self.assertEqual(hash(b), hash(c))
+        b = memoryview(y)
+
+        self.assertEqual(a, b)
+        self.assertEqual(hash(a), hash(b))
 
         # non-byte formats
         nd = ndarray(list(range(12)), shape=[2,2,3], format='L')

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

From python-checkins at python.org  Tue Nov  6 23:56:38 2012
From: python-checkins at python.org (stefan.krah)
Date: Tue,  6 Nov 2012 23:56:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Null_merge=2E?=
Message-ID: <3Xx5jL0CJBzMWH@mail.python.org>

http://hg.python.org/cpython/rev/4059b7a551df
changeset:   80283:4059b7a551df
parent:      80277:ec897bb38708
parent:      80282:55cc29d7e83a
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Nov 06 23:36:08 2012 +0100
summary:
  Null merge.

files:



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

From python-checkins at python.org  Tue Nov  6 23:56:39 2012
From: python-checkins at python.org (stefan.krah)
Date: Tue,  6 Nov 2012 23:56:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2Uu?=
Message-ID: <3Xx5jM3x21zMch@mail.python.org>

http://hg.python.org/cpython/rev/80f51c128d08
changeset:   80284:80f51c128d08
parent:      80283:4059b7a551df
parent:      80279:0e9fbdda3c92
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Nov 06 23:51:42 2012 +0100
summary:
  Merge.

files:
  Lib/test/support.py              |  37 +++++++++++++++++++-
  Lib/test/test_cmd_line.py        |   6 +-
  Lib/test/test_cmd_line_script.py |  11 +----
  Lib/test/test_genericpath.py     |  25 ++++++++++---
  Lib/test/test_os.py              |   4 ++
  5 files changed, 64 insertions(+), 19 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -603,6 +603,32 @@
 # module name.
 TESTFN = "{}_{}_tmp".format(TESTFN, os.getpid())
 
+# FS_NONASCII: non-ASCII character encodable by os.fsencode(),
+# or None if there is no such character.
+FS_NONASCII = None
+for character in (
+    # U+00E6 (Latin small letter AE): Encodable to cp1252, cp1254, cp1257, iso-8859-1
+    '\u00E6',
+    # U+0141 (Latin capital letter L with stroke): Encodable to cp1250, cp1257
+    '\u0141',
+    # U+041A (Cyrillic capital letter KA): Encodable to cp932, cp950, cp1251
+    '\u041A',
+    # U+05D0 (Hebrew Letter Alef): Encodable to cp424, cp1255
+    '\u05D0',
+    # U+06A9 (Arabic letter KEHEH): Encodable to cp1256
+    '\u06A9',
+    # U+03A9 (Greek capital letter OMEGA): Encodable to cp932, cp950, cp1253
+    '\u03A9',
+    # U+0E01 (Thai character KO KAI): Encodable to cp874
+    '\u0E01',
+):
+    try:
+        os.fsdecode(os.fsencode(character))
+    except UnicodeError:
+        pass
+    else:
+        FS_NONASCII = character
+        break
 
 # TESTFN_UNICODE is a non-ascii filename
 TESTFN_UNICODE = TESTFN + "-\xe0\xf2\u0258\u0141\u011f"
@@ -651,13 +677,22 @@
 # decoded from the filesystem encoding (in strict mode). It can be None if we
 # cannot generate such filename.
 TESTFN_UNDECODABLE = None
-for name in (b'abc\xff', b'\xe7w\xf0'):
+# b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
+# accepts it to create a file or a directory, or don't accept to enter to
+# such directory (when the bytes name is used). So test b'\xe7' first: it is
+# not decodable from cp932.
+for name in (b'\xe7w\xf0', b'abc\xff'):
     try:
         os.fsdecode(name)
     except UnicodeDecodeError:
         TESTFN_UNDECODABLE = name
         break
 
+if FS_NONASCII:
+    TESTFN_NONASCII = TESTFN + '- ' + FS_NONASCII
+else:
+    TESTFN_NONASCII = None
+
 # Save the initial cwd
 SAVEDCWD = os.getcwd()
 
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -93,15 +93,15 @@
         # All good if execution is successful
         assert_python_ok('-c', 'pass')
 
-    @unittest.skipIf(sys.getfilesystemencoding() == 'ascii',
-                     'need a filesystem encoding different than ASCII')
+    @unittest.skipUnless(test.support.FS_NONASCII, 'need support.FS_NONASCII')
     def test_non_ascii(self):
         # Test handling of non-ascii data
         if test.support.verbose:
             import locale
             print('locale encoding = %s, filesystem encoding = %s'
                   % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
-        command = "assert(ord('\xe9') == 0xe9)"
+        command = ("assert(ord(%r) == %s)"
+                   % (test.support.FS_NONASCII, ord(test.support.FS_NONASCII)))
         assert_python_ok('-c', command)
 
     # On Windows, pass bytes to subprocess doesn't test how Python decodes the
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,19 +363,12 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
+    @unittest.skipUnless(support.TESTFN_NONASCII, 'need support.TESTFN_NONASCII')
     def test_non_ascii(self):
         # Issue #16218
         # non-ascii filename encodable to cp1252, cp932, latin1 and utf8
-        filename = support.TESTFN + '\xa3'
-        try:
-            os.fsencode(filename)
-        except UnicodeEncodeError:
-            self.skipTest(
-                "Filesystem encoding %r cannot encode "
-                "the filename: %a"
-                % (sys.getfilesystemencoding(), filename))
         source = 'print(ascii(__file__))\n'
-        script_name = _make_test_script(os.curdir, filename, source)
+        script_name = _make_test_script(os.curdir, support.TESTFN_NONASCII, source)
         self.addCleanup(support.unlink, script_name)
         rc, stdout, stderr = assert_python_ok(script_name)
         self.assertEqual(
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -308,15 +308,28 @@
                 for path in ('', 'fuu', 'f\xf9\xf9', '/fuu', 'U:\\'):
                     self.assertIsInstance(abspath(path), str)
 
-    @unittest.skipIf(sys.platform == 'darwin',
-        "Mac OS X denies the creation of a directory with an invalid utf8 name")
     def test_nonascii_abspath(self):
-        if support.TESTFN_UNDECODABLE:
-            name = support.TESTFN_UNDECODABLE
+        # Test non-ASCII in the path
+        if sys.platform in ('win32', 'darwin'):
+            if support.TESTFN_NONASCII:
+                name = support.TESTFN_NONASCII
+            else:
+                # Mac OS X denies the creation of a directory with an invalid
+                # UTF-8 name. Windows allows to create a directory with an
+                # arbitrary bytes name, but fails to enter this directory
+                # (when the bytes name is used).
+                self.skipTest("need support.TESTFN_NONASCII")
         else:
-            name = b'a\xffb\xe7w\xf0'
+            if support.TESTFN_UNDECODABLE:
+                name = support.TESTFN_UNDECODABLE
+            elif support.TESTFN_NONASCII:
+                name = support.TESTFN_NONASCII
+            else:
+                # On UNIX, the surrogateescape error handler is used to
+                # decode paths, so any byte is allowed, it does not depend
+                # on the locale
+                name = b'a\xffb\xe7w\xf0'
 
-        # Test non-ASCII, non-UTF8 bytes in the path.
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
             with support.temp_cwd(name):
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
@@ -1243,6 +1243,8 @@
         def setUp(self):
             if support.TESTFN_UNENCODABLE:
                 self.dir = support.TESTFN_UNENCODABLE
+            elif support.TESTFN_NONASCII:
+                self.dir = support.TESTFN_NONASCII
             else:
                 self.dir = support.TESTFN
             self.bdir = os.fsencode(self.dir)
@@ -1257,6 +1259,8 @@
             add_filename(support.TESTFN_UNICODE)
             if support.TESTFN_UNENCODABLE:
                 add_filename(support.TESTFN_UNENCODABLE)
+            if support.TESTFN_NONASCII:
+                add_filename(support.TESTFN_NONASCII)
             if not bytesfn:
                 self.skipTest("couldn't create any non-ascii filename")
 

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

From python-checkins at python.org  Tue Nov  6 23:56:40 2012
From: python-checkins at python.org (stefan.krah)
Date: Tue,  6 Nov 2012 23:56:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2Uu?=
Message-ID: <3Xx5jN6TFxzMcT@mail.python.org>

http://hg.python.org/cpython/rev/55e58e2bf95c
changeset:   80285:55e58e2bf95c
parent:      80284:80f51c128d08
parent:      80281:7f90305d9f23
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Nov 06 23:55:58 2012 +0100
summary:
  Merge.

files:
  Lib/test/support.py |  37 ++++++++++++++++++++++++--------
  1 files changed, 27 insertions(+), 10 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -607,20 +607,37 @@
 # or None if there is no such character.
 FS_NONASCII = None
 for character in (
-    # U+00E6 (Latin small letter AE): Encodable to cp1252, cp1254, cp1257, iso-8859-1
+    # First try printable and common characters to have a readable filename.
+    # For each character, the encoding list are just example of encodings able
+    # to encode the character (the list is not exhaustive).
+
+    # U+00E6 (Latin Small Letter Ae): cp1252, iso-8859-1
     '\u00E6',
-    # U+0141 (Latin capital letter L with stroke): Encodable to cp1250, cp1257
+    # U+0130 (Latin Capital Letter I With Dot Above): cp1254, iso8859_3
+    '\u0130',
+    # U+0141 (Latin Capital Letter L With Stroke): cp1250, cp1257
     '\u0141',
-    # U+041A (Cyrillic capital letter KA): Encodable to cp932, cp950, cp1251
+    # U+03C6 (Greek Small Letter Phi): cp1253
+    '\u03C6',
+    # U+041A (Cyrillic Capital Letter Ka): cp1251
     '\u041A',
-    # U+05D0 (Hebrew Letter Alef): Encodable to cp424, cp1255
+    # U+05D0 (Hebrew Letter Alef): Encodable to cp424
     '\u05D0',
-    # U+06A9 (Arabic letter KEHEH): Encodable to cp1256
-    '\u06A9',
-    # U+03A9 (Greek capital letter OMEGA): Encodable to cp932, cp950, cp1253
-    '\u03A9',
-    # U+0E01 (Thai character KO KAI): Encodable to cp874
+    # U+060C (Arabic Comma): cp864, cp1006, iso8859_6, mac_arabic
+    '\u060C',
+    # U+062A (Arabic Letter Teh): cp720
+    '\u062A',
+    # U+0E01 (Thai Character Ko Kai): cp874
     '\u0E01',
+
+    # Then try more "special" characters. "special" because they may be
+    # interpreted or displayed differently depending on the exact locale
+    # encoding and the font.
+
+    # U+00A0 (No-Break Space)
+    '\u00A0',
+    # U+20AC (Euro Sign)
+    '\u20AC',
 ):
     try:
         os.fsdecode(os.fsencode(character))
@@ -689,7 +706,7 @@
         break
 
 if FS_NONASCII:
-    TESTFN_NONASCII = TESTFN + '- ' + FS_NONASCII
+    TESTFN_NONASCII = TESTFN + '-' + FS_NONASCII
 else:
     TESTFN_NONASCII = None
 

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

From python-checkins at python.org  Wed Nov  7 00:10:14 2012
From: python-checkins at python.org (victor.stinner)
Date: Wed,  7 Nov 2012 00:10:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316414=3A_Fix_test?=
 =?utf-8?q?=5Fos_on_Windows=2C_don=27t_test_os=2Elistdir=28=29_with_undeco?=
 =?utf-8?q?dable?=
Message-ID: <3Xx6123yQgzM4D@mail.python.org>

http://hg.python.org/cpython/rev/fce9e892c65d
changeset:   80286:fce9e892c65d
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Nov 07 00:10:14 2012 +0100
summary:
  Issue #16414: Fix test_os on Windows, don't test os.listdir() with undecodable

With the ANSI code page 932, os.listdir(b'\xe7') return an empty list (instead
of failing), whereas os.listdir(b'\xff') raises a FileNotFoundError.

It looks like a Windows bug: b'\xe7' directory does not exist,
FindFirstFileA(b'\xe7') fails with ERROR_FILE_NOT_FOUND (2), instead of
ERROR_PATH_NOT_FOUND (3).

files:
  Lib/test/test_os.py |  12 +++++++++++-
  1 files changed, 11 insertions(+), 1 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
@@ -2076,7 +2076,6 @@
         funcs = [
             (self.filenames, os.chdir,),
             (self.filenames, os.chmod, 0o777),
-            (self.filenames, os.listdir,),
             (self.filenames, os.lstat,),
             (self.filenames, os.open, os.O_RDONLY),
             (self.filenames, os.rmdir,),
@@ -2089,9 +2088,20 @@
                 (self.bytes_filenames, os.replace, b"dst"),
                 (self.unicode_filenames, os.rename, "dst"),
                 (self.unicode_filenames, os.replace, "dst"),
+                # Issue #16414: Don't test undecodable names with listdir()
+                # because of a Windows bug.
+                #
+                # With the ANSI code page 932, os.listdir(b'\xe7') return an
+                # empty list (instead of failing), whereas os.listdir(b'\xff')
+                # raises a FileNotFoundError. It looks like a Windows bug:
+                # b'\xe7' directory does not exist, FindFirstFileA(b'\xe7')
+                # fails with ERROR_FILE_NOT_FOUND (2), instead of
+                # ERROR_PATH_NOT_FOUND (3).
+                (self.unicode_filenames, os.listdir,),
             ))
         else:
             funcs.extend((
+                (self.filenames, os.listdir,),
                 (self.filenames, os.rename, "dst"),
                 (self.filenames, os.replace, "dst"),
             ))

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

From python-checkins at python.org  Wed Nov  7 00:41:03 2012
From: python-checkins at python.org (victor.stinner)
Date: Wed,  7 Nov 2012 00:41:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2316311=3A_Use_the_?=
 =?utf-8?q?=5FPyUnicodeWriter_API_in_text_decoders?=
Message-ID: <3Xx6hb4dKyzMP7@mail.python.org>

http://hg.python.org/cpython/rev/7ed9993d53b4
changeset:   80287:7ed9993d53b4
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Nov 07 00:36:38 2012 +0100
summary:
  Close #16311: Use the _PyUnicodeWriter API in text decoders

 * Remove unicode_widen(): replaced with _PyUnicodeWriter_Prepare()
 * Remove unicode_putchar(): replaced with
   PyUnicodeWriter_Prepare() + PyUnicode_WRITER()
 * When handling an decoding error, only overallocate the buffer by +25%
   instead of +100%

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


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1644,38 +1644,6 @@
     return unicode_resize(p_unicode, length);
 }
 
-static int
-unicode_widen(PyObject **p_unicode, Py_ssize_t length,
-              unsigned int maxchar)
-{
-    PyObject *result;
-    assert(PyUnicode_IS_READY(*p_unicode));
-    assert(length <= PyUnicode_GET_LENGTH(*p_unicode));
-    if (maxchar <= PyUnicode_MAX_CHAR_VALUE(*p_unicode))
-        return 0;
-    result = PyUnicode_New(PyUnicode_GET_LENGTH(*p_unicode),
-                           maxchar);
-    if (result == NULL)
-        return -1;
-    _PyUnicode_FastCopyCharacters(result, 0, *p_unicode, 0, length);
-    Py_DECREF(*p_unicode);
-    *p_unicode = result;
-    return 0;
-}
-
-static int
-unicode_putchar(PyObject **p_unicode, Py_ssize_t *pos,
-                Py_UCS4 ch)
-{
-    assert(ch <= MAX_UNICODE);
-    if (unicode_widen(p_unicode, *pos, ch) < 0)
-        return -1;
-    PyUnicode_WRITE(PyUnicode_KIND(*p_unicode),
-                    PyUnicode_DATA(*p_unicode),
-                    (*pos)++, ch);
-    return 0;
-}
-
 /* Copy a ASCII or latin1 char* string into a Python Unicode string.
 
    WARNING: The function doesn't copy the terminating null character and
@@ -3925,6 +3893,7 @@
     *exceptionObject = NULL;
 }
 
+#ifdef HAVE_MBCS
 /* error handling callback helper:
    build arguments, call the callback and check the arguments,
    if no exception occurred, copy the replacement to the output
@@ -3933,11 +3902,12 @@
 */
 
 static int
-unicode_decode_call_errorhandler(const char *errors, PyObject **errorHandler,
-                                 const char *encoding, const char *reason,
-                                 const char **input, const char **inend, Py_ssize_t *startinpos,
-                                 Py_ssize_t *endinpos, PyObject **exceptionObject, const char **inptr,
-                                 PyObject **output, Py_ssize_t *outpos)
+unicode_decode_call_errorhandler_wchar(
+    const char *errors, PyObject **errorHandler,
+    const char *encoding, const char *reason,
+    const char **input, const char **inend, Py_ssize_t *startinpos,
+    Py_ssize_t *endinpos, PyObject **exceptionObject, const char **inptr,
+    PyObject **output, Py_ssize_t *outpos)
 {
     static char *argparse = "O!n;decoding error handler must return (str, int) tuple";
 
@@ -3948,12 +3918,11 @@
     Py_ssize_t requiredsize;
     Py_ssize_t newpos;
     PyObject *inputobj = NULL;
-    int res = -1;
-
-    if (_PyUnicode_KIND(*output) != PyUnicode_WCHAR_KIND)
-        outsize = PyUnicode_GET_LENGTH(*output);
-    else
-        outsize = _PyUnicode_WSTR_LENGTH(*output);
+    wchar_t *repwstr;
+    Py_ssize_t repwlen;
+
+    assert (_PyUnicode_KIND(*output) == PyUnicode_WCHAR_KIND);
+    outsize = _PyUnicode_WSTR_LENGTH(*output);
 
     if (*errorHandler == NULL) {
         *errorHandler = PyCodec_LookupError(errors);
@@ -3978,8 +3947,6 @@
     }
     if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type, &repunicode, &newpos))
         goto onError;
-    if (PyUnicode_READY(repunicode) == -1)
-        goto onError;
 
     /* Copy back the bytes variables, which might have been modified by the
        callback */
@@ -4003,54 +3970,112 @@
         goto onError;
     }
 
-    if (_PyUnicode_KIND(*output) != PyUnicode_WCHAR_KIND) {
-        /* need more space? (at least enough for what we
-           have+the replacement+the rest of the string (starting
-           at the new input position), so we won't have to check space
-           when there are no errors in the rest of the string) */
-        Py_ssize_t replen = PyUnicode_GET_LENGTH(repunicode);
-        requiredsize = *outpos + replen + insize-newpos;
-        if (requiredsize > outsize) {
-            if (requiredsize<2*outsize)
-                requiredsize = 2*outsize;
-            if (unicode_resize(output, requiredsize) < 0)
-                goto onError;
-        }
-        if (unicode_widen(output, *outpos,
-                          PyUnicode_MAX_CHAR_VALUE(repunicode)) < 0)
+    repwstr = PyUnicode_AsUnicodeAndSize(repunicode, &repwlen);
+    if (repwstr == NULL)
+        goto onError;
+    /* need more space? (at least enough for what we
+       have+the replacement+the rest of the string (starting
+       at the new input position), so we won't have to check space
+       when there are no errors in the rest of the string) */
+    requiredsize = *outpos + repwlen + insize-newpos;
+    if (requiredsize > outsize) {
+        if (requiredsize < 2*outsize)
+            requiredsize = 2*outsize;
+        if (unicode_resize(output, requiredsize) < 0)
             goto onError;
-        _PyUnicode_FastCopyCharacters(*output, *outpos, repunicode, 0, replen);
-        *outpos += replen;
-    }
-    else {
-        wchar_t *repwstr;
-        Py_ssize_t repwlen;
-        repwstr = PyUnicode_AsUnicodeAndSize(repunicode, &repwlen);
-        if (repwstr == NULL)
-            goto onError;
-        /* need more space? (at least enough for what we
-           have+the replacement+the rest of the string (starting
-           at the new input position), so we won't have to check space
-           when there are no errors in the rest of the string) */
-        requiredsize = *outpos + repwlen + insize-newpos;
-        if (requiredsize > outsize) {
-            if (requiredsize < 2*outsize)
-                requiredsize = 2*outsize;
-            if (unicode_resize(output, requiredsize) < 0)
-                goto onError;
-        }
-        wcsncpy(_PyUnicode_WSTR(*output) + *outpos, repwstr, repwlen);
-        *outpos += repwlen;
-    }
+    }
+    wcsncpy(_PyUnicode_WSTR(*output) + *outpos, repwstr, repwlen);
+    *outpos += repwlen;
+
     *endinpos = newpos;
     *inptr = *input + newpos;
 
     /* we made it! */
-    res = 0;
+    Py_XDECREF(restuple);
+    return 0;
 
   onError:
     Py_XDECREF(restuple);
-    return res;
+    return -1;
+}
+#endif   /* HAVE_MBCS */
+
+static int
+unicode_decode_call_errorhandler_writer(
+    const char *errors, PyObject **errorHandler,
+    const char *encoding, const char *reason,
+    const char **input, const char **inend, Py_ssize_t *startinpos,
+    Py_ssize_t *endinpos, PyObject **exceptionObject, const char **inptr,
+    _PyUnicodeWriter *writer /* PyObject **output, Py_ssize_t *outpos */)
+{
+    static char *argparse = "O!n;decoding error handler must return (str, int) tuple";
+
+    PyObject *restuple = NULL;
+    PyObject *repunicode = NULL;
+    Py_ssize_t insize;
+    Py_ssize_t newpos;
+    PyObject *inputobj = NULL;
+
+    if (*errorHandler == NULL) {
+        *errorHandler = PyCodec_LookupError(errors);
+        if (*errorHandler == NULL)
+            goto onError;
+    }
+
+    make_decode_exception(exceptionObject,
+        encoding,
+        *input, *inend - *input,
+        *startinpos, *endinpos,
+        reason);
+    if (*exceptionObject == NULL)
+        goto onError;
+
+    restuple = PyObject_CallFunctionObjArgs(*errorHandler, *exceptionObject, NULL);
+    if (restuple == NULL)
+        goto onError;
+    if (!PyTuple_Check(restuple)) {
+        PyErr_SetString(PyExc_TypeError, &argparse[4]);
+        goto onError;
+    }
+    if (!PyArg_ParseTuple(restuple, argparse, &PyUnicode_Type, &repunicode, &newpos))
+        goto onError;
+
+    /* Copy back the bytes variables, which might have been modified by the
+       callback */
+    inputobj = PyUnicodeDecodeError_GetObject(*exceptionObject);
+    if (!inputobj)
+        goto onError;
+    if (!PyBytes_Check(inputobj)) {
+        PyErr_Format(PyExc_TypeError, "exception attribute object must be bytes");
+    }
+    *input = PyBytes_AS_STRING(inputobj);
+    insize = PyBytes_GET_SIZE(inputobj);
+    *inend = *input + insize;
+    /* we can DECREF safely, as the exception has another reference,
+       so the object won't go away. */
+    Py_DECREF(inputobj);
+
+    if (newpos<0)
+        newpos = insize+newpos;
+    if (newpos<0 || newpos>insize) {
+        PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", newpos);
+        goto onError;
+    }
+
+    writer->overallocate = 1;
+    if (_PyUnicodeWriter_WriteStr(writer, repunicode) == -1)
+        return
+
+    *endinpos = newpos;
+    *inptr = *input + newpos;
+
+    /* we made it! */
+    Py_XDECREF(restuple);
+    return 0;
+
+  onError:
+    Py_XDECREF(restuple);
+    return -1;
 }
 
 /* --- UTF-7 Codec -------------------------------------------------------- */
@@ -4158,9 +4183,8 @@
     const char *starts = s;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
-    Py_ssize_t outpos;
     const char *e;
-    PyObject *unicode;
+    _PyUnicodeWriter writer;
     const char *errmsg = "";
     int inShift = 0;
     Py_ssize_t shiftOutStart;
@@ -4170,17 +4194,19 @@
     PyObject *errorHandler = NULL;
     PyObject *exc = NULL;
 
-    /* Start off assuming it's all ASCII. Widen later as necessary. */
-    unicode = PyUnicode_New(size, 127);
-    if (!unicode)
-        return NULL;
     if (size == 0) {
         if (consumed)
             *consumed = 0;
-        return unicode;
-    }
-
-    shiftOutStart = outpos = 0;
+        Py_INCREF(unicode_empty);
+        return unicode_empty;
+    }
+
+    /* Start off assuming it's all ASCII. Widen later as necessary. */
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, size, 127) == -1)
+        goto onError;
+
+    shiftOutStart = 0;
     e = s + size;
 
     while (s < e) {
@@ -4202,14 +4228,18 @@
                         /* expecting a second surrogate */
                         if (Py_UNICODE_IS_LOW_SURROGATE(outCh)) {
                             Py_UCS4 ch2 = Py_UNICODE_JOIN_SURROGATES(surrogate, outCh);
-                            if (unicode_putchar(&unicode, &outpos, ch2) < 0)
+                            if (_PyUnicodeWriter_Prepare(&writer, 1, ch2) == -1)
                                 goto onError;
+                            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch2);
+                            writer.pos++;
                             surrogate = 0;
                             continue;
                         }
                         else {
-                            if (unicode_putchar(&unicode, &outpos, surrogate) < 0)
+                            if (_PyUnicodeWriter_Prepare(&writer, 1, surrogate) == -1)
                                 goto onError;
+                            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, surrogate);
+                            writer.pos++;
                             surrogate = 0;
                         }
                     }
@@ -4218,8 +4248,10 @@
                         surrogate = outCh;
                     }
                     else {
-                        if (unicode_putchar(&unicode, &outpos, outCh) < 0)
+                        if (_PyUnicodeWriter_Prepare(&writer, 1, outCh) == -1)
                             goto onError;
+                        PyUnicode_WRITE(writer.kind, writer.data, writer.pos, outCh);
+                        writer.pos++;
                     }
                 }
             }
@@ -4227,8 +4259,10 @@
                 inShift = 0;
                 s++;
                 if (surrogate) {
-                    if (unicode_putchar(&unicode, &outpos, surrogate) < 0)
+                    if (_PyUnicodeWriter_Prepare(&writer, 1, surrogate) == -1)
                         goto onError;
+                    PyUnicode_WRITE(writer.kind, writer.data, writer.pos, surrogate);
+                    writer.pos++;
                     surrogate = 0;
                 }
                 if (base64bits > 0) { /* left-over bits */
@@ -4248,8 +4282,10 @@
                 if (ch != '-') {
                     /* '-' is absorbed; other terminating
                        characters are preserved */
-                    if (unicode_putchar(&unicode, &outpos, ch) < 0)
+                    if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)
                         goto onError;
+                    PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch);
+                    writer.pos++;
                 }
             }
         }
@@ -4258,19 +4294,23 @@
             s++; /* consume '+' */
             if (s < e && *s == '-') { /* '+-' encodes '+' */
                 s++;
-                if (unicode_putchar(&unicode, &outpos, '+') < 0)
+                if (_PyUnicodeWriter_Prepare(&writer, 1, '+') == -1)
                     goto onError;
+                PyUnicode_WRITE(writer.kind, writer.data, writer.pos, '+');
+                writer.pos++;
             }
             else { /* begin base64-encoded section */
                 inShift = 1;
-                shiftOutStart = outpos;
+                shiftOutStart = writer.pos;
                 base64bits = 0;
             }
         }
         else if (DECODE_DIRECT(ch)) { /* character decodes as itself */
-            if (unicode_putchar(&unicode, &outpos, ch) < 0)
+            s++;
+            if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)
                 goto onError;
-            s++;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch);
+            writer.pos++;
         }
         else {
             startinpos = s-starts;
@@ -4281,11 +4321,11 @@
         continue;
 utf7Error:
         endinpos = s-starts;
-        if (unicode_decode_call_errorhandler(
+        if (unicode_decode_call_errorhandler_writer(
                 errors, &errorHandler,
                 "utf7", errmsg,
                 &starts, &e, &startinpos, &endinpos, &exc, &s,
-                &unicode, &outpos))
+                &writer))
             goto onError;
     }
 
@@ -4297,11 +4337,11 @@
                 (base64bits >= 6) ||
                 (base64bits > 0 && base64buffer != 0)) {
             endinpos = size;
-            if (unicode_decode_call_errorhandler(
+            if (unicode_decode_call_errorhandler_writer(
                     errors, &errorHandler,
                     "utf7", "unterminated shift sequence",
                     &starts, &e, &startinpos, &endinpos, &exc, &s,
-                    &unicode, &outpos))
+                    &writer))
                 goto onError;
             if (s < e)
                 goto restart;
@@ -4311,7 +4351,7 @@
     /* return state */
     if (consumed) {
         if (inShift) {
-            outpos = shiftOutStart; /* back off output */
+            writer.pos = shiftOutStart; /* back off output */
             *consumed = startinpos;
         }
         else {
@@ -4319,17 +4359,14 @@
         }
     }
 
-    if (unicode_resize(&unicode, outpos) < 0)
-        goto onError;
-
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(unicode);
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    Py_DECREF(unicode);
+    _PyUnicodeWriter_Dealloc(&writer);
     return NULL;
 }
 
@@ -4555,10 +4592,9 @@
                              const char *errors,
                              Py_ssize_t *consumed)
 {
-    PyObject *unicode;
+    _PyUnicodeWriter writer;
     const char *starts = s;
     const char *end = s + size;
-    Py_ssize_t outpos;
 
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
@@ -4580,29 +4616,25 @@
         return get_latin1_char((unsigned char)s[0]);
     }
 
-    unicode = PyUnicode_New(size, 127);
-    if (!unicode)
-        return NULL;
-
-    outpos = ascii_decode(s, end, PyUnicode_1BYTE_DATA(unicode));
-    s += outpos;
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, size, 127) == -1)
+        goto onError;
+
+    writer.pos = ascii_decode(s, end, writer.data);
+    s += writer.pos;
     while (s < end) {
         Py_UCS4 ch;
-        int kind = PyUnicode_KIND(unicode);
+        int kind = writer.kind;
         if (kind == PyUnicode_1BYTE_KIND) {
-            if (PyUnicode_IS_ASCII(unicode))
-                ch = asciilib_utf8_decode(&s, end,
-                        PyUnicode_1BYTE_DATA(unicode), &outpos);
+            if (PyUnicode_IS_ASCII(writer.buffer))
+                ch = asciilib_utf8_decode(&s, end, writer.data, &writer.pos);
             else
-                ch = ucs1lib_utf8_decode(&s, end,
-                        PyUnicode_1BYTE_DATA(unicode), &outpos);
+                ch = ucs1lib_utf8_decode(&s, end, writer.data, &writer.pos);
         } else if (kind == PyUnicode_2BYTE_KIND) {
-            ch = ucs2lib_utf8_decode(&s, end,
-                    PyUnicode_2BYTE_DATA(unicode), &outpos);
+            ch = ucs2lib_utf8_decode(&s, end, writer.data, &writer.pos);
         } else {
             assert(kind == PyUnicode_4BYTE_KIND);
-            ch = ucs4lib_utf8_decode(&s, end,
-                    PyUnicode_4BYTE_DATA(unicode), &outpos);
+            ch = ucs4lib_utf8_decode(&s, end, writer.data, &writer.pos);
         }
 
         switch (ch) {
@@ -4626,35 +4658,33 @@
             endinpos = startinpos + ch - 1;
             break;
         default:
-            if (unicode_putchar(&unicode, &outpos, ch) < 0)
+            if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)
                 goto onError;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch);
+            writer.pos++;
             continue;
         }
 
-        if (unicode_decode_call_errorhandler(
+        if (unicode_decode_call_errorhandler_writer(
                 errors, &errorHandler,
                 "utf-8", errmsg,
                 &starts, &end, &startinpos, &endinpos, &exc, &s,
-                &unicode, &outpos))
+                &writer))
             goto onError;
     }
 
 End:
-    if (unicode_resize(&unicode, outpos) < 0)
-        goto onError;
-
     if (consumed)
         *consumed = s - starts;
 
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    assert(_PyUnicode_CheckConsistency(unicode, 1));
-    return unicode;
+    return _PyUnicodeWriter_Finish(&writer);
 
 onError:
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    Py_XDECREF(unicode);
+    _PyUnicodeWriter_Dealloc(&writer);
     return NULL;
 }
 
@@ -4799,8 +4829,7 @@
     const char *starts = s;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
-    Py_ssize_t outpos;
-    PyObject *unicode;
+    _PyUnicodeWriter writer;
     const unsigned char *q, *e;
     int le, bo = 0;       /* assume native ordering by default */
     const char *errmsg = "";
@@ -4844,25 +4873,25 @@
     le = bo <= 0;
 #endif
 
-    unicode = PyUnicode_New((e - q + 3) / 4, 127);
-    if (!unicode)
-        return NULL;
-
-    outpos = 0;
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, (e - q + 3) / 4, 127) == -1)
+        goto onError;
+
     while (1) {
         Py_UCS4 ch = 0;
-        Py_UCS4 maxch = PyUnicode_MAX_CHAR_VALUE(unicode);
+        Py_UCS4 maxch = PyUnicode_MAX_CHAR_VALUE(writer.buffer);
 
         if (e - q >= 4) {
-            enum PyUnicode_Kind kind = PyUnicode_KIND(unicode);
-            void *data = PyUnicode_DATA(unicode);
+            enum PyUnicode_Kind kind = writer.kind;
+            void *data = writer.data;
             const unsigned char *last = e - 4;
+            Py_ssize_t pos = writer.pos;
             if (le) {
                 do {
                     ch = (q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0];
                     if (ch > maxch)
                         break;
-                    PyUnicode_WRITE(kind, data, outpos++, ch);
+                    PyUnicode_WRITE(kind, data, pos++, ch);
                     q += 4;
                 } while (q <= last);
             }
@@ -4871,10 +4900,11 @@
                     ch = (q[0] << 24) | (q[1] << 16) | (q[2] << 8) | q[3];
                     if (ch > maxch)
                         break;
-                    PyUnicode_WRITE(kind, data, outpos++, ch);
+                    PyUnicode_WRITE(kind, data, pos++, ch);
                     q += 4;
                 } while (q <= last);
             }
+            writer.pos = pos;
         }
 
         if (ch <= maxch) {
@@ -4887,8 +4917,10 @@
         }
         else {
             if (ch < 0x110000) {
-                if (unicode_putchar(&unicode, &outpos, ch) < 0)
+                if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)
                     goto onError;
+                PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch);
+                writer.pos++;
                 q += 4;
                 continue;
             }
@@ -4899,27 +4931,23 @@
 
         /* The remaining input chars are ignored if the callback
            chooses to skip the input */
-        if (unicode_decode_call_errorhandler(
+        if (unicode_decode_call_errorhandler_writer(
                 errors, &errorHandler,
                 "utf32", errmsg,
                 &starts, (const char **)&e, &startinpos, &endinpos, &exc, (const char **)&q,
-                &unicode, &outpos))
+                &writer))
             goto onError;
     }
 
     if (consumed)
         *consumed = (const char *)q-starts;
 
-    /* Adjust length */
-    if (unicode_resize(&unicode, outpos) < 0)
-        goto onError;
-
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(unicode);
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
-    Py_DECREF(unicode);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
@@ -5040,8 +5068,7 @@
     const char *starts = s;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
-    Py_ssize_t outpos;
-    PyObject *unicode;
+    _PyUnicodeWriter writer;
     const unsigned char *q, *e;
     int bo = 0;       /* assume native ordering by default */
     int native_ordering;
@@ -5088,32 +5115,31 @@
 
     /* Note: size will always be longer than the resulting Unicode
        character count */
-    unicode = PyUnicode_New((e - q + 1) / 2, 127);
-    if (!unicode)
-        return NULL;
-
-    outpos = 0;
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, (e - q + 1) / 2, 127) == -1)
+        goto onError;
+
     while (1) {
         Py_UCS4 ch = 0;
         if (e - q >= 2) {
-            int kind = PyUnicode_KIND(unicode);
+            int kind = writer.kind;
             if (kind == PyUnicode_1BYTE_KIND) {
-                if (PyUnicode_IS_ASCII(unicode))
+                if (PyUnicode_IS_ASCII(writer.buffer))
                     ch = asciilib_utf16_decode(&q, e,
-                            PyUnicode_1BYTE_DATA(unicode), &outpos,
+                            (Py_UCS1*)writer.data, &writer.pos,
                             native_ordering);
                 else
                     ch = ucs1lib_utf16_decode(&q, e,
-                            PyUnicode_1BYTE_DATA(unicode), &outpos,
+                            (Py_UCS1*)writer.data, &writer.pos,
                             native_ordering);
             } else if (kind == PyUnicode_2BYTE_KIND) {
                 ch = ucs2lib_utf16_decode(&q, e,
-                        PyUnicode_2BYTE_DATA(unicode), &outpos,
+                        (Py_UCS2*)writer.data, &writer.pos,
                         native_ordering);
             } else {
                 assert(kind == PyUnicode_4BYTE_KIND);
                 ch = ucs4lib_utf16_decode(&q, e,
-                        PyUnicode_4BYTE_DATA(unicode), &outpos,
+                        (Py_UCS4*)writer.data, &writer.pos,
                         native_ordering);
             }
         }
@@ -5146,12 +5172,14 @@
             endinpos = startinpos + 2;
             break;
         default:
-            if (unicode_putchar(&unicode, &outpos, ch) < 0)
+            if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)
                 goto onError;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch);
+            writer.pos++;
             continue;
         }
 
-        if (unicode_decode_call_errorhandler(
+        if (unicode_decode_call_errorhandler_writer(
                 errors,
                 &errorHandler,
                 "utf16", errmsg,
@@ -5161,8 +5189,7 @@
                 &endinpos,
                 &exc,
                 (const char **)&q,
-                &unicode,
-                &outpos))
+                &writer))
             goto onError;
     }
 
@@ -5170,16 +5197,12 @@
     if (consumed)
         *consumed = (const char *)q-starts;
 
-    /* Adjust length */
-    if (unicode_resize(&unicode, outpos) < 0)
-        goto onError;
-
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(unicode);
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
-    Py_DECREF(unicode);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
@@ -5346,27 +5369,30 @@
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
     int j;
-    PyObject *v;
+    _PyUnicodeWriter writer;
     const char *end;
     char* message;
     Py_UCS4 chr = 0xffffffff; /* in case 'getcode' messes up */
     PyObject *errorHandler = NULL;
     PyObject *exc = NULL;
     Py_ssize_t len;
-    Py_ssize_t i;
 
     len = length_of_escaped_ascii_string(s, size);
+    if (len == 0) {
+        Py_INCREF(unicode_empty);
+        return unicode_empty;
+    }
 
     /* After length_of_escaped_ascii_string() there are two alternatives,
        either the string is pure ASCII with named escapes like \n, etc.
        and we determined it's exact size (common case)
        or it contains \x, \u, ... escape sequences.  then we create a
        legacy wchar string and resize it at the end of this function. */
-    if (len >= 0) {
-        v = PyUnicode_New(len, 127);
-        if (!v)
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (len > 0) {
+        if (_PyUnicodeWriter_Prepare(&writer, len, 127) == -1)
             goto onError;
-        assert(PyUnicode_KIND(v) == PyUnicode_1BYTE_KIND);
+        assert(writer.kind == PyUnicode_1BYTE_KIND);
     }
     else {
         /* Escaped strings will always be longer than the resulting
@@ -5374,15 +5400,12 @@
            length after conversion to the true value.
            (but if the error callback returns a long replacement string
            we'll have to allocate more space) */
-        v = PyUnicode_New(size, 127);
-        if (!v)
+        if (_PyUnicodeWriter_Prepare(&writer, size, 127) == -1)
             goto onError;
-        len = size;
     }
 
     if (size == 0)
-        return v;
-    i = 0;
+        return _PyUnicodeWriter_Finish(&writer);
     end = s + size;
 
     while (s < end) {
@@ -5390,14 +5413,14 @@
         Py_UCS4 x;
         int digits;
 
-        /* The only case in which i == ascii_length is a backslash
-           followed by a newline. */
-        assert(i <= len);
-
         /* Non-escape characters are interpreted as Unicode ordinals */
         if (*s != '\\') {
-            if (unicode_putchar(&v, &i, (unsigned char) *s++) < 0)
+            x = (unsigned char)*s;
+            s++;
+            if (_PyUnicodeWriter_Prepare(&writer, 1, x) == -1)
                 goto onError;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, x);
+            writer.pos++;
             continue;
         }
 
@@ -5410,16 +5433,18 @@
 
         /* The only case in which i == ascii_length is a backslash
            followed by a newline. */
-        assert(i < len || (i == len && c == '\n'));
+        assert(writer.pos < writer.size || (writer.pos == writer.size && c == '\n'));
 
         switch (c) {
 
             /* \x escapes */
-#define WRITECHAR(ch)                                   \
-            do {                                        \
-                if (unicode_putchar(&v, &i, ch) < 0)    \
-                    goto onError;                       \
-            }while(0)
+#define WRITECHAR(ch)                                                      \
+            do {                                                           \
+                if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)        \
+                    goto onError;                                          \
+                PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch); \
+                writer.pos++;                                              \
+            } while(0)
 
         case '\n': break;
         case '\\': WRITECHAR('\\'); break;
@@ -5469,11 +5494,11 @@
             chr = 0;
             if (s+digits>end) {
                 endinpos = size;
-                if (unicode_decode_call_errorhandler(
+                if (unicode_decode_call_errorhandler_writer(
                         errors, &errorHandler,
                         "unicodeescape", "end of string in escape sequence",
                         &starts, &end, &startinpos, &endinpos, &exc, &s,
-                        &v, &i))
+                        &writer))
                     goto onError;
                 goto nextByte;
             }
@@ -5481,13 +5506,12 @@
                 c = (unsigned char) s[j];
                 if (!Py_ISXDIGIT(c)) {
                     endinpos = (s+j+1)-starts;
-                    if (unicode_decode_call_errorhandler(
+                    if (unicode_decode_call_errorhandler_writer(
                             errors, &errorHandler,
                             "unicodeescape", message,
                             &starts, &end, &startinpos, &endinpos, &exc, &s,
-                            &v, &i))
+                            &writer))
                         goto onError;
-                    len = PyUnicode_GET_LENGTH(v);
                     goto nextByte;
                 }
                 chr = (chr<<4) & ~0xF;
@@ -5509,11 +5533,11 @@
                 WRITECHAR(chr);
             } else {
                 endinpos = s-starts;
-                if (unicode_decode_call_errorhandler(
+                if (unicode_decode_call_errorhandler_writer(
                         errors, &errorHandler,
                         "unicodeescape", "illegal Unicode character",
                         &starts, &end, &startinpos, &endinpos, &exc, &s,
-                        &v, &i))
+                        &writer))
                     goto onError;
             }
             break;
@@ -5543,11 +5567,11 @@
                 }
             }
             endinpos = s-starts;
-            if (unicode_decode_call_errorhandler(
+            if (unicode_decode_call_errorhandler_writer(
                     errors, &errorHandler,
                     "unicodeescape", message,
                     &starts, &end, &startinpos, &endinpos, &exc, &s,
-                    &v, &i))
+                    &writer))
                 goto onError;
             break;
 
@@ -5556,11 +5580,11 @@
                 message = "\\ at end of string";
                 s--;
                 endinpos = s-starts;
-                if (unicode_decode_call_errorhandler(
+                if (unicode_decode_call_errorhandler_writer(
                         errors, &errorHandler,
                         "unicodeescape", message,
                         &starts, &end, &startinpos, &endinpos, &exc, &s,
-                        &v, &i))
+                        &writer))
                     goto onError;
             }
             else {
@@ -5574,24 +5598,22 @@
     }
 #undef WRITECHAR
 
-    if (unicode_resize(&v, i) < 0)
-        goto onError;
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(v);
+    return _PyUnicodeWriter_Finish(&writer);
 
   ucnhashError:
     PyErr_SetString(
         PyExc_UnicodeError,
         "\\N escapes not supported (can't load unicodedata module)"
         );
-    Py_XDECREF(v);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
 
   onError:
-    Py_XDECREF(v);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
@@ -5744,23 +5766,25 @@
     const char *starts = s;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
-    Py_ssize_t outpos;
-    PyObject *v;
+    _PyUnicodeWriter writer;
     const char *end;
     const char *bs;
     PyObject *errorHandler = NULL;
     PyObject *exc = NULL;
 
+    if (size == 0) {
+        Py_INCREF(unicode_empty);
+        return unicode_empty;
+    }
+
     /* Escaped strings will always be longer than the resulting
        Unicode string, so we start with size here and then reduce the
        length after conversion to the true value. (But decoding error
        handler might have to resize the string) */
-    v = PyUnicode_New(size, 127);
-    if (v == NULL)
+    _PyUnicodeWriter_Init(&writer, 1);
+    if (_PyUnicodeWriter_Prepare(&writer, size, 127) == -1)
         goto onError;
-    if (size == 0)
-        return v;
-    outpos = 0;
+
     end = s + size;
     while (s < end) {
         unsigned char c;
@@ -5770,8 +5794,11 @@
 
         /* Non-escape characters are interpreted as Unicode ordinals */
         if (*s != '\\') {
-            if (unicode_putchar(&v, &outpos, (unsigned char)*s++) < 0)
+            x = (unsigned char)*s++;
+            if (_PyUnicodeWriter_Prepare(&writer, 1, x) == -1)
                 goto onError;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, x);
+            writer.pos++;
             continue;
         }
         startinpos = s-starts;
@@ -5782,15 +5809,18 @@
         for (;s < end;) {
             if (*s != '\\')
                 break;
-            if (unicode_putchar(&v, &outpos, (unsigned char)*s++) < 0)
+            x = (unsigned char)*s++;
+            if (_PyUnicodeWriter_Prepare(&writer, 1, x) == -1)
                 goto onError;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, x);
+            writer.pos++;
         }
         if (((s - bs) & 1) == 0 ||
             s >= end ||
             (*s != 'u' && *s != 'U')) {
             continue;
         }
-        outpos--;
+        writer.pos--;
         count = *s=='u' ? 4 : 8;
         s++;
 
@@ -5799,11 +5829,11 @@
             c = (unsigned char)*s;
             if (!Py_ISXDIGIT(c)) {
                 endinpos = s-starts;
-                if (unicode_decode_call_errorhandler(
+                if (unicode_decode_call_errorhandler_writer(
                         errors, &errorHandler,
                         "rawunicodeescape", "truncated \\uXXXX",
                         &starts, &end, &startinpos, &endinpos, &exc, &s,
-                        &v, &outpos))
+                        &writer))
                     goto onError;
                 goto nextByte;
             }
@@ -5816,28 +5846,29 @@
                 x += 10 + c - 'A';
         }
         if (x <= MAX_UNICODE) {
-            if (unicode_putchar(&v, &outpos, x) < 0)
+            if (_PyUnicodeWriter_Prepare(&writer, 1, x) == -1)
                 goto onError;
-        } else {
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, x);
+            writer.pos++;
+        }
+        else {
             endinpos = s-starts;
-            if (unicode_decode_call_errorhandler(
+            if (unicode_decode_call_errorhandler_writer(
                     errors, &errorHandler,
                     "rawunicodeescape", "\\Uxxxxxxxx out of range",
                     &starts, &end, &startinpos, &endinpos, &exc, &s,
-                    &v, &outpos))
+                    &writer))
                 goto onError;
         }
       nextByte:
         ;
     }
-    if (unicode_resize(&v, outpos) < 0)
-        goto onError;
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(v);
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
-    Py_XDECREF(v);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
@@ -5937,8 +5968,7 @@
     const char *starts = s;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
-    Py_ssize_t outpos;
-    PyObject *v;
+    _PyUnicodeWriter writer;
     const char *end;
     const char *reason;
     PyObject *errorHandler = NULL;
@@ -5949,13 +5979,15 @@
                      1))
         return NULL;
 
+    if (size == 0) {
+        Py_INCREF(unicode_empty);
+        return unicode_empty;
+    }
+
     /* XXX overflow detection missing */
-    v = PyUnicode_New((size+Py_UNICODE_SIZE-1)/ Py_UNICODE_SIZE, 127);
-    if (v == NULL)
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, (size+Py_UNICODE_SIZE-1)/ Py_UNICODE_SIZE, 127) == -1)
         goto onError;
-    if (PyUnicode_GET_LENGTH(v) == 0)
-        return v;
-    outpos = 0;
     end = s + size;
 
     while (s < end) {
@@ -5989,11 +6021,11 @@
                 endinpos = s - starts + Py_UNICODE_SIZE;
                 reason = "illegal code point (> 0x10FFFF)";
             }
-            if (unicode_decode_call_errorhandler(
+            if (unicode_decode_call_errorhandler_writer(
                     errors, &errorHandler,
                     "unicode_internal", reason,
                     &starts, &end, &startinpos, &endinpos, &exc, &s,
-                    &v, &outpos))
+                    &writer))
                 goto onError;
             continue;
         }
@@ -6013,18 +6045,18 @@
         }
 #endif
 
-        if (unicode_putchar(&v, &outpos, ch) < 0)
+        if (_PyUnicodeWriter_Prepare(&writer, 1, ch) == -1)
             goto onError;
-    }
-
-    if (unicode_resize(&v, outpos) < 0)
-        goto onError;
+        PyUnicode_WRITE(writer.kind, writer.data, writer.pos, ch);
+        writer.pos++;
+    }
+
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(v);
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
-    Py_XDECREF(v);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
@@ -6388,7 +6420,7 @@
                       const char *errors)
 {
     const char *starts = s;
-    PyObject *unicode;
+    _PyUnicodeWriter writer;
     int kind;
     void *data;
     Py_ssize_t startinpos;
@@ -6407,46 +6439,45 @@
     if (size == 1 && (unsigned char)s[0] < 128)
         return get_latin1_char((unsigned char)s[0]);
 
-    unicode = PyUnicode_New(size, 127);
-    if (unicode == NULL)
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, size, 127) == -1)
         goto onError;
 
     e = s + size;
-    data = PyUnicode_1BYTE_DATA(unicode);
+    data = writer.data;
     outpos = ascii_decode(s, e, (Py_UCS1 *)data);
-    if (outpos == size)
-        return unicode;
-
-    s += outpos;
-    kind = PyUnicode_1BYTE_KIND;
+    writer.pos = outpos;
+    if (writer.pos == size)
+        return _PyUnicodeWriter_Finish(&writer);
+
+    s += writer.pos;
+    kind = writer.kind;
     while (s < e) {
         register unsigned char c = (unsigned char)*s;
         if (c < 128) {
-            PyUnicode_WRITE(kind, data, outpos++, c);
+            PyUnicode_WRITE(kind, data, writer.pos, c);
+            writer.pos++;
             ++s;
         }
         else {
             startinpos = s-starts;
             endinpos = startinpos + 1;
-            if (unicode_decode_call_errorhandler(
+            if (unicode_decode_call_errorhandler_writer(
                     errors, &errorHandler,
                     "ascii", "ordinal not in range(128)",
                     &starts, &e, &startinpos, &endinpos, &exc, &s,
-                    &unicode, &outpos))
+                    &writer))
                 goto onError;
-            kind = PyUnicode_KIND(unicode);
-            data = PyUnicode_DATA(unicode);
-        }
-    }
-    if (unicode_resize(&unicode, outpos) < 0)
-        goto onError;
+            kind = writer.kind;
+            data = writer.data;
+        }
+    }
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    assert(_PyUnicode_CheckConsistency(unicode, 1));
-    return unicode;
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
-    Py_XDECREF(unicode);
+    _PyUnicodeWriter_Dealloc(&writer);
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
     return NULL;
@@ -6707,7 +6738,7 @@
             startinpos = in - startin;
             endinpos = startinpos + 1;
             outpos = out - PyUnicode_AS_UNICODE(*v);
-            if (unicode_decode_call_errorhandler(
+            if (unicode_decode_call_errorhandler_wchar(
                     errors, &errorHandler,
                     encoding, reason,
                     &startin, &endin, &startinpos, &endinpos, &exc, &in,
@@ -7249,10 +7280,8 @@
     const char *starts = s;
     Py_ssize_t startinpos;
     Py_ssize_t endinpos;
-    Py_ssize_t outpos;
     const char *e;
-    PyObject *v;
-    Py_ssize_t extrachars = 0;
+    _PyUnicodeWriter writer;
     PyObject *errorHandler = NULL;
     PyObject *exc = NULL;
 
@@ -7260,12 +7289,14 @@
     if (mapping == NULL)
         return PyUnicode_DecodeLatin1(s, size, errors);
 
-    v = PyUnicode_New(size, 127);
-    if (v == NULL)
+    if (size == 0) {
+        Py_INCREF(unicode_empty);
+        return unicode_empty;
+    }
+    _PyUnicodeWriter_Init(&writer, 0);
+    if (_PyUnicodeWriter_Prepare(&writer, size, 127) == -1)
         goto onError;
-    if (size == 0)
-        return v;
-    outpos = 0;
+
     e = s + size;
     if (PyUnicode_CheckExact(mapping)) {
         Py_ssize_t maplen;
@@ -7282,28 +7313,29 @@
         while (s < e) {
             unsigned char ch;
             if (mapkind == PyUnicode_2BYTE_KIND && maplen >= 256) {
-                enum PyUnicode_Kind outkind = PyUnicode_KIND(v);
+                enum PyUnicode_Kind outkind = writer.kind;
+                void *outdata = writer.data;
                 if (outkind == PyUnicode_1BYTE_KIND) {
-                    void *outdata = PyUnicode_DATA(v);
-                    Py_UCS4 maxchar = PyUnicode_MAX_CHAR_VALUE(v);
+                    Py_UCS4 maxchar = writer.maxchar;
                     while (s < e) {
                         unsigned char ch = *s;
                         x = PyUnicode_READ(PyUnicode_2BYTE_KIND, mapdata, ch);
                         if (x > maxchar)
                             goto Error;
-                        PyUnicode_WRITE(PyUnicode_1BYTE_KIND, outdata, outpos++, x);
+                        PyUnicode_WRITE(PyUnicode_1BYTE_KIND, outdata, writer.pos, x);
+                        writer.pos++;
                         ++s;
                     }
                     break;
                 }
                 else if (outkind == PyUnicode_2BYTE_KIND) {
-                    void *outdata = PyUnicode_DATA(v);
                     while (s < e) {
                         unsigned char ch = *s;
                         x = PyUnicode_READ(PyUnicode_2BYTE_KIND, mapdata, ch);
                         if (x == 0xFFFE)
                             goto Error;
-                        PyUnicode_WRITE(PyUnicode_2BYTE_KIND, outdata, outpos++, x);
+                        PyUnicode_WRITE(PyUnicode_2BYTE_KIND, outdata, writer.pos, x);
+                        writer.pos++;
                         ++s;
                     }
                     break;
@@ -7321,18 +7353,20 @@
                 /* undefined mapping */
                 startinpos = s-starts;
                 endinpos = startinpos+1;
-                if (unicode_decode_call_errorhandler(
+                if (unicode_decode_call_errorhandler_writer(
                         errors, &errorHandler,
                         "charmap", "character maps to <undefined>",
                         &starts, &e, &startinpos, &endinpos, &exc, &s,
-                        &v, &outpos)) {
+                        &writer)) {
                     goto onError;
                 }
                 continue;
             }
 
-            if (unicode_putchar(&v, &outpos, x) < 0)
+            if (_PyUnicodeWriter_Prepare(&writer, 1, x) == -1)
                 goto onError;
+            PyUnicode_WRITE(writer.kind, writer.data, writer.pos, x);
+            writer.pos++;
             ++s;
         }
     }
@@ -7367,18 +7401,21 @@
                     Py_DECREF(x);
                     goto onError;
                 }
-                if (unicode_putchar(&v, &outpos, value) < 0)
+
+                if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1)
                     goto onError;
+                PyUnicode_WRITE(writer.kind, writer.data, writer.pos, value);
+                writer.pos++;
             }
             else if (x == Py_None) {
                 /* undefined mapping */
                 startinpos = s-starts;
                 endinpos = startinpos+1;
-                if (unicode_decode_call_errorhandler(
+                if (unicode_decode_call_errorhandler_writer(
                         errors, &errorHandler,
                         "charmap", "character maps to <undefined>",
                         &starts, &e, &startinpos, &endinpos, &exc, &s,
-                        &v, &outpos)) {
+                        &writer)) {
                     Py_DECREF(x);
                     goto onError;
                 }
@@ -7386,40 +7423,9 @@
                 continue;
             }
             else if (PyUnicode_Check(x)) {
-                Py_ssize_t targetsize;
-
-                if (PyUnicode_READY(x) == -1)
+                writer.overallocate = 1;
+                if (_PyUnicodeWriter_WriteStr(&writer, x) == -1)
                     goto onError;
-                targetsize = PyUnicode_GET_LENGTH(x);
-
-                if (targetsize == 1) {
-                    /* 1-1 mapping */
-                    if (unicode_putchar(&v, &outpos,
-                                        PyUnicode_READ_CHAR(x, 0)) < 0)
-                        goto onError;
-                }
-                else if (targetsize > 1) {
-                    /* 1-n mapping */
-                    if (targetsize > extrachars) {
-                        /* resize first */
-                        Py_ssize_t needed = (targetsize - extrachars) + \
-                            (targetsize << 2);
-                        extrachars += needed;
-                        /* XXX overflow detection missing */
-                        if (unicode_resize(&v,
-                                           PyUnicode_GET_LENGTH(v) + needed) < 0)
-                        {
-                            Py_DECREF(x);
-                            goto onError;
-                        }
-                    }
-                    if (unicode_widen(&v, outpos, PyUnicode_MAX_CHAR_VALUE(x)) < 0)
-                        goto onError;
-                    PyUnicode_CopyCharacters(v, outpos, x, 0, targetsize);
-                    outpos += targetsize;
-                    extrachars -= targetsize;
-                }
-                /* 1-0 mapping: skip the character */
             }
             else {
                 /* wrong return value */
@@ -7432,16 +7438,14 @@
             ++s;
         }
     }
-    if (unicode_resize(&v, outpos) < 0)
-        goto onError;
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    return unicode_result(v);
+    return _PyUnicodeWriter_Finish(&writer);
 
   onError:
     Py_XDECREF(errorHandler);
     Py_XDECREF(exc);
-    Py_XDECREF(v);
+    _PyUnicodeWriter_Dealloc(&writer);
     return NULL;
 }
 

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

From python-checkins at python.org  Wed Nov  7 00:57:12 2012
From: python-checkins at python.org (victor.stinner)
Date: Wed,  7 Nov 2012 00:57:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_outdated_comment?=
Message-ID: <3Xx73D6HGCzM34@mail.python.org>

http://hg.python.org/cpython/rev/7d5f35326a77
changeset:   80288:7d5f35326a77
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Nov 07 00:57:26 2012 +0100
summary:
  Remove outdated comment

files:
  Lib/test/test_cmd_line_script.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -366,7 +366,6 @@
     @unittest.skipUnless(support.TESTFN_NONASCII, 'need support.TESTFN_NONASCII')
     def test_non_ascii(self):
         # Issue #16218
-        # non-ascii filename encodable to cp1252, cp932, latin1 and utf8
         source = 'print(ascii(__file__))\n'
         script_name = _make_test_script(os.curdir, support.TESTFN_NONASCII, source)
         self.addCleanup(support.unlink, script_name)

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

From solipsis at pitrou.net  Wed Nov  7 05:56:36 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 07 Nov 2012 05:56:36 +0100
Subject: [Python-checkins] Daily reference leaks (7d5f35326a77): sum=2
Message-ID: <E1TVxgq-0006x8-KN@ap.vmr.nerim.net>

results for 7d5f35326a77 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/reflogxdONoJ', '-x']

From python-checkins at python.org  Wed Nov  7 09:14:30 2012
From: python-checkins at python.org (hynek.schlawack)
Date: Wed,  7 Nov 2012 09:14:30 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1MDAx?=
 =?utf-8?b?OiBmaXggc2VnZmF1bHQgb24gImRlbCBzeXMubW9kdWxlWydfX21haW5fXydd?=
 =?utf-8?q?=22?=
Message-ID: <3XxL52116ZzMnP@mail.python.org>

http://hg.python.org/cpython/rev/b256d054f229
changeset:   80289:b256d054f229
branch:      3.2
parent:      80268:0dfa3b09a6fe
user:        Hynek Schlawack <hs at ox.cx>
date:        Wed Nov 07 09:02:24 2012 +0100
summary:
  Issue #15001: fix segfault on "del sys.module['__main__']"

Patch by Victor Stinner.

files:
  Lib/test/test_cmd_line.py |  12 ++++++++++++
  Misc/NEWS                 |   3 +++
  Python/pythonrun.c        |  12 ++++++------
  3 files changed, 21 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -364,6 +364,18 @@
         self.assertEqual(rc, 0)
         self.assertIn(b'random is 1', out)
 
+    def test_del___main__(self):
+        # Issue #15001: PyRun_SimpleFileExFlags() did crash because it kept a
+        # borrowed reference to the dict of __main__ module and later modify
+        # the dict whereas the module was destroyed
+        filename = test.support.TESTFN
+        self.addCleanup(test.support.unlink, filename)
+        with open(filename, "w") as script:
+            print("import sys", file=script)
+            print("del sys.modules['__main__']", file=script)
+        assert_python_ok(filename)
+
+
 def test_main():
     test.support.run_unittest(CmdLineTest)
     test.support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
+  Stinner.
+
 - Issue #5057: the peepholer no longer optimizes subscription on unicode
   literals (e.g. u'foo'[0]) in order to produce compatible pyc files between
   narrow and wide builds.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1257,25 +1257,26 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret;
+    int set_file_name = 0, ret = -1;
     size_t len;
 
     m = PyImport_AddModule("__main__");
     if (m == NULL)
         return -1;
+    Py_INCREF(m);
     d = PyModule_GetDict(m);
     if (PyDict_GetItemString(d, "__file__") == NULL) {
         PyObject *f;
         f = PyUnicode_DecodeFSDefault(filename);
         if (f == NULL)
-            return -1;
+            goto done;
         if (PyDict_SetItemString(d, "__file__", f) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         set_file_name = 1;
         Py_DECREF(f);
@@ -1288,7 +1289,6 @@
             fclose(fp);
         if ((fp = fopen(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
-            ret = -1;
             goto done;
         }
         /* Turn on optimization if a .pyo file is given */
@@ -1302,7 +1302,6 @@
     flush_io();
     if (v == NULL) {
         PyErr_Print();
-        ret = -1;
         goto done;
     }
     Py_DECREF(v);
@@ -1310,6 +1309,7 @@
   done:
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
+    Py_DECREF(m);
     return ret;
 }
 

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

From python-checkins at python.org  Wed Nov  7 09:14:31 2012
From: python-checkins at python.org (hynek.schlawack)
Date: Wed,  7 Nov 2012 09:14:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2315001=3A_fix_segfault_on_=22del_sys=2Emodule=5B=27=5F?=
 =?utf-8?b?X21haW5fXyddIg==?=
Message-ID: <3XxL533XqZzPK9@mail.python.org>

http://hg.python.org/cpython/rev/215297665098
changeset:   80290:215297665098
branch:      3.3
parent:      80282:55cc29d7e83a
parent:      80289:b256d054f229
user:        Hynek Schlawack <hs at ox.cx>
date:        Wed Nov 07 09:07:22 2012 +0100
summary:
  Issue #15001: fix segfault on "del sys.module['__main__']"

Patch by Victor Stinner.

files:
  Lib/test/test_cmd_line.py |  12 ++++++++++++
  Misc/NEWS                 |   3 +++
  Python/pythonrun.c        |  12 ++++++------
  3 files changed, 21 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -358,6 +358,18 @@
         self.assertEqual(rc, 0)
         self.assertIn(b'random is 1', out)
 
+    def test_del___main__(self):
+        # Issue #15001: PyRun_SimpleFileExFlags() did crash because it kept a
+        # borrowed reference to the dict of __main__ module and later modify
+        # the dict whereas the module was destroyed
+        filename = test.support.TESTFN
+        self.addCleanup(test.support.unlink, filename)
+        with open(filename, "w") as script:
+            print("import sys", file=script)
+            print("del sys.modules['__main__']", file=script)
+        assert_python_ok(filename)
+
+
 def test_main():
     test.support.run_unittest(CmdLineTest)
     test.support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
+  Stinner.
+
 - Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
   characters when used with the 'replace' error handler on invalid utf-8
   sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1390,25 +1390,26 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret;
+    int set_file_name = 0, ret = -1;
     size_t len;
 
     m = PyImport_AddModule("__main__");
     if (m == NULL)
         return -1;
+    Py_INCREF(m);
     d = PyModule_GetDict(m);
     if (PyDict_GetItemString(d, "__file__") == NULL) {
         PyObject *f;
         f = PyUnicode_DecodeFSDefault(filename);
         if (f == NULL)
-            return -1;
+            goto done;
         if (PyDict_SetItemString(d, "__file__", f) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         set_file_name = 1;
         Py_DECREF(f);
@@ -1422,7 +1423,6 @@
             fclose(fp);
         if ((pyc_fp = fopen(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
-            ret = -1;
             goto done;
         }
         /* Turn on optimization if a .pyo file is given */
@@ -1451,7 +1451,6 @@
     flush_io();
     if (v == NULL) {
         PyErr_Print();
-        ret = -1;
         goto done;
     }
     Py_DECREF(v);
@@ -1459,6 +1458,7 @@
   done:
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
+    Py_DECREF(m);
     return ret;
 }
 

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

From python-checkins at python.org  Wed Nov  7 09:14:32 2012
From: python-checkins at python.org (hynek.schlawack)
Date: Wed,  7 Nov 2012 09:14:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315001=3A_fix_segfault_on_=22del_sys=2Emodule=5B?=
 =?utf-8?b?J19fbWFpbl9fJ10i?=
Message-ID: <3XxL545vHyzPVg@mail.python.org>

http://hg.python.org/cpython/rev/859ef54bdce2
changeset:   80291:859ef54bdce2
parent:      80288:7d5f35326a77
parent:      80290:215297665098
user:        Hynek Schlawack <hs at ox.cx>
date:        Wed Nov 07 09:10:49 2012 +0100
summary:
  Issue #15001: fix segfault on "del sys.module['__main__']"

Patch by Victor Stinner.

files:
  Lib/test/test_cmd_line.py |  12 ++++++++++++
  Misc/NEWS                 |   3 +++
  Python/pythonrun.c        |  12 ++++++------
  3 files changed, 21 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -375,6 +375,18 @@
         self.assertEqual(rc, 0)
         self.assertIn(b'random is 1', out)
 
+    def test_del___main__(self):
+        # Issue #15001: PyRun_SimpleFileExFlags() did crash because it kept a
+        # borrowed reference to the dict of __main__ module and later modify
+        # the dict whereas the module was destroyed
+        filename = test.support.TESTFN
+        self.addCleanup(test.support.unlink, filename)
+        with open(filename, "w") as script:
+            print("import sys", file=script)
+            print("del sys.modules['__main__']", file=script)
+        assert_python_ok(filename)
+
+
 def test_main():
     test.support.run_unittest(CmdLineTest)
     test.support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
+  Stinner.
+
 - Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD
   characters when used with the 'replace' error handler on invalid utf-8
   sequences.  Patch by Serhiy Storchaka, tests by Ezio Melotti.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1390,25 +1390,26 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret;
+    int set_file_name = 0, ret = -1;
     size_t len;
 
     m = PyImport_AddModule("__main__");
     if (m == NULL)
         return -1;
+    Py_INCREF(m);
     d = PyModule_GetDict(m);
     if (PyDict_GetItemString(d, "__file__") == NULL) {
         PyObject *f;
         f = PyUnicode_DecodeFSDefault(filename);
         if (f == NULL)
-            return -1;
+            goto done;
         if (PyDict_SetItemString(d, "__file__", f) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         set_file_name = 1;
         Py_DECREF(f);
@@ -1422,7 +1423,6 @@
             fclose(fp);
         if ((pyc_fp = fopen(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
-            ret = -1;
             goto done;
         }
         /* Turn on optimization if a .pyo file is given */
@@ -1451,7 +1451,6 @@
     flush_io();
     if (v == NULL) {
         PyErr_Print();
-        ret = -1;
         goto done;
     }
     Py_DECREF(v);
@@ -1459,6 +1458,7 @@
   done:
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
+    Py_DECREF(m);
     return ret;
 }
 

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

From python-checkins at python.org  Wed Nov  7 09:42:19 2012
From: python-checkins at python.org (marc-andre.lemburg)
Date: Wed,  7 Nov 2012 09:42:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Issue_=2316420=3A?=
Message-ID: <3XxLj75F0vzPdc@mail.python.org>

http://hg.python.org/peps/rev/95a73d5a3af7
changeset:   4578:95a73d5a3af7
user:        Marc-Andre Lemburg <mal at egenix.com>
date:        Wed Nov 07 09:42:07 2012 +0100
summary:
  Issue #16420:
Convert PEP 249 (DB-API 2.0) to ReST format to allow linking to the
various parts.

The conversion was done mostly by Daniele Varrazzo.

files:
  pep-0249.txt |  1976 ++++++++++++++++++++-----------------
  1 files changed, 1073 insertions(+), 903 deletions(-)


diff --git a/pep-0249.txt b/pep-0249.txt
--- a/pep-0249.txt
+++ b/pep-0249.txt
@@ -1,592 +1,699 @@
 PEP: 249
 Title: Python Database API Specification v2.0
-Version: $Revision: 56119 $
-Last-Modified: $Date: 2007-06-28 22:11:32 +0200 (Thu, 28 Jun 2007) $
+Version: $Revision$
+Last-Modified: $Date$
 Author: mal at lemburg.com (Marc-Andr? Lemburg)
 Discussions-To: db-sig at python.org
 Status: Final
 Type: Informational
+Content-Type: text/x-rst
 Created:
 Post-History:
 Replaces: 248
 
-Introduction
-    
-    This API has been defined to encourage similarity between the
-    Python modules that are used to access databases.  By doing this,
-    we hope to achieve a consistency leading to more easily understood
-    modules, code that is generally more portable across databases,
-    and a broader reach of database connectivity from Python.
-    
-    The interface specification consists of several sections:
-    
-        * Module Interface
-        * Connection Objects
-        * Cursor Objects
-        * Type Objects and Constructors
-        * Implementation Hints for Module Authors
-        * Optional DB API Extensions
-        * Optional Error Handling Extensions
-        * Optional Two-Phase Commit Extensions
-        * Frequently Asked Questions
-        * Major Changes from Version 1.0 to Version 2.0
-        * Open Issues
-        * Footnotes
-        * Acknowledgments
-    
-    Comments and questions about this specification may be directed
-    to the SIG for Database Interfacing with Python
-    (db-sig at python.org).
 
-    For more information on database interfacing with Python and
-    available packages see the Database Topic
-    Guide at http://www.python.org/topics/database/.
+`Introduction`_
+===============
 
-    This document describes the Python Database API Specification 2.0
-    and a set of common optional extensions.  The previous version 1.0
-    version is still available as reference, in PEP 248. Package
-    writers are encouraged to use this version of the specification as
-    basis for new interfaces.
+This API has been defined to encourage similarity between the Python
+modules that are used to access databases.  By doing this, we hope to
+achieve a consistency leading to more easily understood modules, code
+that is generally more portable across databases, and a broader reach
+of database connectivity from Python.
 
-Module Interface
-        
-    Access to the database is made available through connection
-    objects. The module must provide the following constructor for
-    these:
+Comments and questions about this specification may be directed to the
+`SIG for Database Interfacing with Python <db-sig at python.org>`__.
 
-        connect(parameters...)
+For more information on database interfacing with Python and available
+packages see the `Database Topic Guide
+<http://www.python.org/topics/database/>`__.
 
-            Constructor for creating a connection to the database.
-            Returns a Connection Object. It takes a number of
-            parameters which are database dependent. [1]
-        
-    These module globals must be defined:
+This document describes the Python Database API Specification 2.0 and
+a set of common optional extensions.  The previous version 1.0 version
+is still available as reference, in :PEP:`248`. Package writers are
+encouraged to use this version of the specification as basis for new
+interfaces.
 
-        apilevel
 
-            String constant stating the supported DB API level.
-            Currently only the strings '1.0' and '2.0' are allowed.
-            
-            If not given, a DB-API 1.0 level interface should be
-            assumed.
-            
-        threadsafety
+`Module Interface`_
+===================
 
-            Integer constant stating the level of thread safety the
-            interface supports. Possible values are:
+`Constructors`_
+---------------
 
-                0     Threads may not share the module.
-                1     Threads may share the module, but not connections.
-                2     Threads may share the module and connections.
-                3     Threads may share the module, connections and
-                      cursors.
+Access to the database is made available through connection
+objects. The module must provide the following constructor for these:
 
-            Sharing in the above context means that two threads may
-            use a resource without wrapping it using a mutex semaphore
-            to implement resource locking. Note that you cannot always
-            make external resources thread safe by managing access
-            using a mutex: the resource may rely on global variables
-            or other external sources that are beyond your control.
+.. _connect:
 
-        paramstyle
-          
-            String constant stating the type of parameter marker
-            formatting expected by the interface. Possible values are
-            [2]:
+`connect`_\ ( *parameters...* )
+    Constructor for creating a connection to the database.
 
-                'qmark'         Question mark style, 
-                                e.g. '...WHERE name=?'
-                'numeric'       Numeric, positional style, 
-                                e.g. '...WHERE name=:1'
-                'named'         Named style, 
-                                e.g. '...WHERE name=:name'
-                'format'        ANSI C printf format codes, 
-                                e.g. '...WHERE name=%s'
-                'pyformat'      Python extended format codes, 
-                                e.g. '...WHERE name=%(name)s'
+    Returns a Connection_ Object. It takes a number of parameters
+    which are database dependent. [1]_
 
-    The module should make all error information available through
-    these exceptions or subclasses thereof:
 
-        Warning 
-            
-            Exception raised for important warnings like data
-            truncations while inserting, etc. It must be a subclass of
-            the Python StandardError (defined in the module
-            exceptions).
-            
-        Error 
+`Globals`_
+----------
 
-            Exception that is the base class of all other error
-            exceptions. You can use this to catch all errors with one
-            single 'except' statement. Warnings are not considered
-            errors and thus should not use this class as base. It must
-            be a subclass of the Python StandardError (defined in the
-            module exceptions).
-            
-        InterfaceError
+These module globals must be defined:
 
-            Exception raised for errors that are related to the
-            database interface rather than the database itself.  It
-            must be a subclass of Error.
+.. _apilevel:
 
-        DatabaseError
+`apilevel`_
+    String constant stating the supported DB API level.
 
-            Exception raised for errors that are related to the
-            database.  It must be a subclass of Error.
-            
-        DataError
-          
-            Exception raised for errors that are due to problems with
-            the processed data like division by zero, numeric value
-            out of range, etc. It must be a subclass of DatabaseError.
-            
-        OperationalError
-          
-            Exception raised for errors that are related to the
-            database's operation and not necessarily under the control
-            of the programmer, e.g. an unexpected disconnect occurs,
-            the data source name is not found, a transaction could not
-            be processed, a memory allocation error occurred during
-            processing, etc.  It must be a subclass of DatabaseError.
-            
-        IntegrityError             
-          
-            Exception raised when the relational integrity of the
-            database is affected, e.g. a foreign key check fails.  It
-            must be a subclass of DatabaseError.
-            
-        InternalError 
-                      
-            Exception raised when the database encounters an internal
-            error, e.g. the cursor is not valid anymore, the
-            transaction is out of sync, etc.  It must be a subclass of
-            DatabaseError.
-            
-        ProgrammingError
-          
-            Exception raised for programming errors, e.g. table not
-            found or already exists, syntax error in the SQL
-            statement, wrong number of parameters specified, etc.  It
-            must be a subclass of DatabaseError.
-            
-        NotSupportedError
-          
-            Exception raised in case a method or database API was used
-            which is not supported by the database, e.g. requesting a
-            .rollback() on a connection that does not support
-            transaction or has transactions turned off.  It must be a
-            subclass of DatabaseError.
-        
-    This is the exception inheritance layout:
+    Currently only the strings "``1.0``" and "``2.0``" are allowed.
+    If not given, a DB-API 1.0 level interface should be assumed.
 
-        StandardError
-        |__Warning
-        |__Error
-           |__InterfaceError
-           |__DatabaseError
-              |__DataError
-              |__OperationalError
-              |__IntegrityError
-              |__InternalError
-              |__ProgrammingError
-              |__NotSupportedError
-        
-    Note: The values of these exceptions are not defined. They should
-    give the user a fairly good idea of what went wrong, though.
-        
 
-Connection Objects
+.. _threadsafety:
 
-    Connection Objects should respond to the following methods:
+`threadsafety`_
+    Integer constant stating the level of thread safety the interface
+    supports.  Possible values are:
 
-        .close() 
-          
-            Close the connection now (rather than whenever __del__ is
-            called).  The connection will be unusable from this point
-            forward; an Error (or subclass) exception will be raised
-            if any operation is attempted with the connection. The
-            same applies to all cursor objects trying to use the
-            connection.  Note that closing a connection without
-            committing the changes first will cause an implicit
-            rollback to be performed.
+    ============ =======================================================
+    threadsafety Meaning
+    ============ =======================================================
+               0 Threads may not share the module.
+               1 Threads may share the module, but not connections.
+               2 Threads may share the module and connections.
+               3 Threads may share the module, connections and cursors.
+    ============ =======================================================
 
-            
-        .commit()
-          
-            Commit any pending transaction to the database. Note that
-            if the database supports an auto-commit feature, this must
-            be initially off. An interface method may be provided to
-            turn it back on.
-            
-            Database modules that do not support transactions should
-            implement this method with void functionality.
-            
-        .rollback() 
-          
-            This method is optional since not all databases provide
-            transaction support. [3]
-            
-            In case a database does provide transactions this method
-            causes the database to roll back to the start of any
-            pending transaction.  Closing a connection without
-            committing the changes first will cause an implicit
-            rollback to be performed.
-            
-        .cursor()
-          
-            Return a new Cursor Object using the connection.  If the
-            database does not provide a direct cursor concept, the
-            module will have to emulate cursors using other means to
-            the extent needed by this specification.  [4]
-            
+    Sharing in the above context means that two threads may use a
+    resource without wrapping it using a mutex semaphore to implement
+    resource locking.  Note that you cannot always make external
+    resources thread safe by managing access using a mutex: the
+    resource may rely on global variables or other external sources
+    that are beyond your control.
 
-Cursor Objects
 
-    These objects represent a database cursor, which is used to manage
-    the context of a fetch operation. Cursors created from the same
-    connection are not isolated, i.e., any changes done to the
-    database by a cursor are immediately visible by the other
-    cursors. Cursors created from different connections can or can not
-    be isolated, depending on how the transaction support is
-    implemented (see also the connection's .rollback() and .commit()
-    methods).
-        
-    Cursor Objects should respond to the following methods and
-    attributes:
+.. _paramstyle:
 
-        .description 
-          
-            This read-only attribute is a sequence of 7-item
-            sequences.  
+`paramstyle`_
+    String constant stating the type of parameter marker formatting
+    expected by the interface. Possible values are [2]_:
 
-            Each of these sequences contains information describing
-            one result column: 
+    ============ ==============================================================
+    paramstyle   Meaning
+    ============ ==============================================================
+    ``qmark``    Question mark style, e.g. ``...WHERE name=?``
+    ``numeric``  Numeric, positional style, e.g. ``...WHERE name=:1``
+    ``named``    Named style, e.g. ``...WHERE name=:name``
+    ``format``   ANSI C printf format codes, e.g. ``...WHERE name=%s``
+    ``pyformat`` Python extended format codes, e.g.  ``...WHERE name=%(name)s``
+    ============ ==============================================================
 
-              (name, 
-               type_code, 
-               display_size,
-               internal_size, 
-               precision, 
-               scale, 
-               null_ok)
 
-            The first two items (name and type_code) are mandatory,
-            the other five are optional and are set to None if no
-            meaningful values can be provided.
+`Exceptions`_
+-------------
 
-            This attribute will be None for operations that
-            do not return rows or if the cursor has not had an
-            operation invoked via the .execute*() method yet.
-            
-            The type_code can be interpreted by comparing it to the
-            Type Objects specified in the section below.
-            
-        .rowcount 
-          
-            This read-only attribute specifies the number of rows that
-            the last .execute*() produced (for DQL statements like
-            'select') or affected (for DML statements like 'update' or
-            'insert').
-            
-            The attribute is -1 in case no .execute*() has been
-            performed on the cursor or the rowcount of the last
-            operation is cannot be determined by the interface. [7]
+The module should make all error information available through these
+exceptions or subclasses thereof:
 
-            Note: Future versions of the DB API specification could
-            redefine the latter case to have the object return None
-            instead of -1.
-            
-        .callproc(procname[,parameters])
-          
-            (This method is optional since not all databases provide
-            stored procedures. [3])
-            
-            Call a stored database procedure with the given name. The
-            sequence of parameters must contain one entry for each
-            argument that the procedure expects. The result of the
-            call is returned as modified copy of the input
-            sequence. Input parameters are left untouched, output and
-            input/output parameters replaced with possibly new values.
-            
-            The procedure may also provide a result set as
-            output. This must then be made available through the
-            standard .fetch*() methods.
-            
-        .close()
-          
-            Close the cursor now (rather than whenever __del__ is
-            called).  The cursor will be unusable from this point
-            forward; an Error (or subclass) exception will be raised
-            if any operation is attempted with the cursor.
-            
-        .execute(operation[,parameters]) 
-          
-            Prepare and execute a database operation (query or
-            command).  Parameters may be provided as sequence or
-            mapping and will be bound to variables in the operation.
-            Variables are specified in a database-specific notation
-            (see the module's paramstyle attribute for details). [5]
-            
-            A reference to the operation will be retained by the
-            cursor.  If the same operation object is passed in again,
-            then the cursor can optimize its behavior.  This is most
-            effective for algorithms where the same operation is used,
-            but different parameters are bound to it (many times).
-            
-            For maximum efficiency when reusing an operation, it is
-            best to use the .setinputsizes() method to specify the
-            parameter types and sizes ahead of time.  It is legal for
-            a parameter to not match the predefined information; the
-            implementation should compensate, possibly with a loss of
-            efficiency.
-            
-            The parameters may also be specified as list of tuples to
-            e.g. insert multiple rows in a single operation, but this
-            kind of usage is deprecated: .executemany() should be used
-            instead.
-            
-            Return values are not defined.
-            
-        .executemany(operation,seq_of_parameters) 
-          
-            Prepare a database operation (query or command) and then
-            execute it against all parameter sequences or mappings
-            found in the sequence seq_of_parameters.
-            
-            Modules are free to implement this method using multiple
-            calls to the .execute() method or by using array operations
-            to have the database process the sequence as a whole in
-            one call.
-            
-            Use of this method for an operation which produces one or
-            more result sets constitutes undefined behavior, and the
-            implementation is permitted (but not required) to raise 
-            an exception when it detects that a result set has been
-            created by an invocation of the operation.
-            
-            The same comments as for .execute() also apply accordingly
-            to this method.
-            
-            Return values are not defined.
-            
-        .fetchone() 
-          
-            Fetch the next row of a query result set, returning a
-            single sequence, or None when no more data is
-            available. [6]
-            
-            An Error (or subclass) exception is raised if the previous
-            call to .execute*() did not produce any result set or no
-            call was issued yet.
+.. _Warning:
 
-        .fetchmany([size=cursor.arraysize])
-          
-            Fetch the next set of rows of a query result, returning a
-            sequence of sequences (e.g. a list of tuples). An empty
-            sequence is returned when no more rows are available.
-            
-            The number of rows to fetch per call is specified by the
-            parameter.  If it is not given, the cursor's arraysize
-            determines the number of rows to be fetched. The method
-            should try to fetch as many rows as indicated by the size
-            parameter. If this is not possible due to the specified
-            number of rows not being available, fewer rows may be
-            returned.
-            
-            An Error (or subclass) exception is raised if the previous
-            call to .execute*() did not produce any result set or no
-            call was issued yet.
-            
-            Note there are performance considerations involved with
-            the size parameter.  For optimal performance, it is
-            usually best to use the arraysize attribute.  If the size
-            parameter is used, then it is best for it to retain the
-            same value from one .fetchmany() call to the next.
-            
-        .fetchall() 
+`Warning`_
+    Exception raised for important warnings like data truncations
+    while inserting, etc. It must be a subclass of the Python
+    ``StandardError`` (defined in the module exceptions).
 
-            Fetch all (remaining) rows of a query result, returning
-            them as a sequence of sequences (e.g. a list of tuples).
-            Note that the cursor's arraysize attribute can affect the
-            performance of this operation.
-            
-            An Error (or subclass) exception is raised if the previous
-            call to .execute*() did not produce any result set or no
-            call was issued yet.
-            
-        .nextset() 
-          
-            (This method is optional since not all databases support
-            multiple result sets. [3])
-            
-            This method will make the cursor skip to the next
-            available set, discarding any remaining rows from the
-            current set.
-            
-            If there are no more sets, the method returns
-            None. Otherwise, it returns a true value and subsequent
-            calls to the fetch methods will return rows from the next
-            result set.
-            
-            An Error (or subclass) exception is raised if the previous
-            call to .execute*() did not produce any result set or no
-            call was issued yet.
 
-        .arraysize
-          
-            This read/write attribute specifies the number of rows to
-            fetch at a time with .fetchmany(). It defaults to 1
-            meaning to fetch a single row at a time.
-            
-            Implementations must observe this value with respect to
-            the .fetchmany() method, but are free to interact with the
-            database a single row at a time. It may also be used in
-            the implementation of .executemany().
-            
-        .setinputsizes(sizes)
-          
-            This can be used before a call to .execute*() to
-            predefine memory areas for the operation's parameters.
-            
-            sizes is specified as a sequence -- one item for each
-            input parameter.  The item should be a Type Object that
-            corresponds to the input that will be used, or it should
-            be an integer specifying the maximum length of a string
-            parameter.  If the item is None, then no predefined memory
-            area will be reserved for that column (this is useful to
-            avoid predefined areas for large inputs).
-            
-            This method would be used before the .execute*() method
-            is invoked.
-            
-            Implementations are free to have this method do nothing
-            and users are free to not use it.
-            
-        .setoutputsize(size[,column])
-          
-            Set a column buffer size for fetches of large columns
-            (e.g. LONGs, BLOBs, etc.).  The column is specified as an
-            index into the result sequence.  Not specifying the column
-            will set the default size for all large columns in the
-            cursor.
-            
-            This method would be used before the .execute*() method
-            is invoked.
-            
-            Implementations are free to have this method do nothing
-            and users are free to not use it.
-            
+.. _Error:
 
-Type Objects and Constructors
+`Error`_
+    Exception that is the base class of all other error
+    exceptions. You can use this to catch all errors with one single
+    ``except`` statement. Warnings are not considered errors and thus
+    should not use this class as base. It must be a subclass of the
+    Python ``StandardError`` (defined in the module exceptions).
 
-    Many databases need to have the input in a particular format for
-    binding to an operation's input parameters.  For example, if an
-    input is destined for a DATE column, then it must be bound to the
-    database in a particular string format.  Similar problems exist
-    for "Row ID" columns or large binary items (e.g. blobs or RAW
-    columns).  This presents problems for Python since the parameters
-    to the .execute*() method are untyped.  When the database module
-    sees a Python string object, it doesn't know if it should be bound
-    as a simple CHAR column, as a raw BINARY item, or as a DATE.
 
-    To overcome this problem, a module must provide the constructors
-    defined below to create objects that can hold special values.
-    When passed to the cursor methods, the module can then detect the
-    proper type of the input parameter and bind it accordingly.
+.. _InterfaceError:
 
-    A Cursor Object's description attribute returns information about
-    each of the result columns of a query.  The type_code must compare
-    equal to one of Type Objects defined below. Type Objects may be
-    equal to more than one type code (e.g. DATETIME could be equal to
-    the type codes for date, time and timestamp columns; see the
-    Implementation Hints below for details).
+`InterfaceError`_
+    Exception raised for errors that are related to the database
+    interface rather than the database itself.  It must be a subclass
+    of Error_.
 
-    The module exports the following constructors and singletons:
-        
-        Date(year,month,day)
 
-            This function constructs an object holding a date value.
-            
-        Time(hour,minute,second)
+.. _DatabaseError:
 
-            This function constructs an object holding a time value.
-            
-        Timestamp(year,month,day,hour,minute,second)
+`DatabaseError`_
+    Exception raised for errors that are related to the database.  It
+    must be a subclass of Error_.
 
-            This function constructs an object holding a time stamp
-            value.
 
-        DateFromTicks(ticks)
+.. _DataError:
 
-            This function constructs an object holding a date value
-            from the given ticks value (number of seconds since the
-            epoch; see the documentation of the standard Python time
-            module for details).
+`DataError`_
+    Exception raised for errors that are due to problems with the
+    processed data like division by zero, numeric value out of range,
+    etc. It must be a subclass of DatabaseError_.
 
-        TimeFromTicks(ticks)
-          
-            This function constructs an object holding a time value
-            from the given ticks value (number of seconds since the
-            epoch; see the documentation of the standard Python time
-            module for details).
-            
-        TimestampFromTicks(ticks)
 
-            This function constructs an object holding a time stamp
-            value from the given ticks value (number of seconds since
-            the epoch; see the documentation of the standard Python
-            time module for details).
+.. _OperationalError:
 
-        Binary(string)
-          
-            This function constructs an object capable of holding a
-            binary (long) string value.
-            
+`OperationalError`_
+    Exception raised for errors that are related to the database's
+    operation and not necessarily under the control of the programmer,
+    e.g. an unexpected disconnect occurs, the data source name is not
+    found, a transaction could not be processed, a memory allocation
+    error occurred during processing, etc.  It must be a subclass of
+    DatabaseError_.
 
-        STRING
 
-            This type object is used to describe columns in a database
-            that are string-based (e.g. CHAR).
+.. _IntegrityError:
 
-        BINARY
+`IntegrityError`_
+    Exception raised when the relational integrity of the database is
+    affected, e.g. a foreign key check fails.  It must be a subclass
+    of DatabaseError_.
 
-            This type object is used to describe (long) binary columns
-            in a database (e.g. LONG, RAW, BLOBs).
-            
-        NUMBER
 
-            This type object is used to describe numeric columns in a
-            database.
+.. _InternalError:
 
-        DATETIME
-          
-            This type object is used to describe date/time columns in
-            a database.
-            
-        ROWID
-          
-            This type object is used to describe the "Row ID" column
-            in a database.
-            
-    SQL NULL values are represented by the Python None singleton on
-    input and output.
+`InternalError`_
+    Exception raised when the database encounters an internal error,
+    e.g. the cursor is not valid anymore, the transaction is out of
+    sync, etc.  It must be a subclass of DatabaseError_.
 
-    Note: Usage of Unix ticks for database interfacing can cause
-    troubles because of the limited date range they cover.
 
+.. _ProgrammingError:
 
-Implementation Hints for Module Authors
+`ProgrammingError`_
+    Exception raised for programming errors, e.g. table not found or
+    already exists, syntax error in the SQL statement, wrong number of
+    parameters specified, etc.  It must be a subclass of
+    DatabaseError_.
 
-    * Date/time objects can be implemented as Python datetime module
-      objects (available since Python 2.3, with a C API since 2.4) or
-      using the mxDateTime package (available for all Python versions
-      since 1.5.2). They both provide all necessary constructors and
-      methods at Python and C level.
-        
-    * Here is a sample implementation of the Unix ticks based
-      constructors for date/time delegating work to the generic
-      constructors:
+
+.. _NotSupportedError:
+
+`NotSupportedError`_
+    Exception raised in case a method or database API was used which
+    is not supported by the database, e.g. requesting a
+    `.rollback()`_ on a connection that does not support transaction
+    or has transactions turned off.  It must be a subclass of
+    DatabaseError_.
+
+This is the exception inheritance layout::
+
+    StandardError
+    |__Warning
+    |__Error
+       |__InterfaceError
+       |__DatabaseError
+          |__DataError
+          |__OperationalError
+          |__IntegrityError
+          |__InternalError
+          |__ProgrammingError
+          |__NotSupportedError
+
+.. Note::
+    The values of these exceptions are not defined. They should give the user
+    a fairly good idea of what went wrong, though.
+
+
+.. _Connection:
+
+`Connection Objects`_
+=====================
+
+Connection objects should respond to the following methods.
+
+
+`Connection methods`_
+---------------------
+
+.. .close():
+.. _Connection.close:
+
+`.close() <#Connection.close>`_
+    Close the connection now (rather than whenever ``.__del__()`` is
+    called).
+
+    The connection will be unusable from this point forward; an Error_
+    (or subclass) exception will be raised if any operation is
+    attempted with the connection. The same applies to all cursor
+    objects trying to use the connection.  Note that closing a
+    connection without committing the changes first will cause an
+    implicit rollback to be performed.
+
+
+.. _.commit:
+.. _.commit():
+
+`.commit`_\ ()
+    Commit any pending transaction to the database.
+
+    Note that if the database supports an auto-commit feature, this must be
+    initially off. An interface method may be provided to turn it back on.
+
+    Database modules that do not support transactions should implement this
+    method with void functionality.
+
+
+.. _.rollback:
+.. _.rollback():
+
+`.rollback`_\ ()
+    This method is optional since not all databases provide transaction
+    support. [3]_
+
+    In case a database does provide transactions this method causes the
+    database to roll back to the start of any pending transaction.  Closing a
+    connection without committing the changes first will cause an implicit
+    rollback to be performed.
+
+
+.. _.cursor:
+
+`.cursor`_\ ()
+    Return a new Cursor_ Object using the connection.
+
+    If the database does not provide a direct cursor concept, the module will
+    have to emulate cursors using other means to the extent needed by this
+    specification.  [4]_
+
+
+
+.. _Cursor:
+
+`Cursor Objects`_
+=================
+
+These objects represent a database cursor, which is used to manage the
+context of a fetch operation. Cursors created from the same connection
+are not isolated, *i.e.*, any changes done to the database by a cursor
+are immediately visible by the other cursors.  Cursors created from
+different connections can or can not be isolated, depending on how the
+transaction support is implemented (see also the connection's
+`.rollback`_\ () and `.commit`_\ () methods).
+
+Cursor Objects should respond to the following methods and attributes.
+
+
+`Cursor attributes`_
+--------------------
+
+.. _.description:
+
+`.description`_
+    This read-only attribute is a sequence of 7-item sequences.
+
+    Each of these sequences contains information describing one result
+    column:
+
+    * ``name``
+    * ``type_code``
+    * ``display_size``
+    * ``internal_size``
+    * ``precision``
+    * ``scale``
+    * ``null_ok``
+
+    The first two items (``name`` and ``type_code``) are mandatory,
+    the other five are optional and are set to ``None`` if no
+    meaningful values can be provided.
+
+    This attribute will be ``None`` for operations that do not return
+    rows or if the cursor has not had an operation invoked via the
+    `.execute*()`_ method yet.
+
+    The ``type_code`` can be interpreted by comparing it to the `Type
+    Objects`_ specified in the section below.
+
+
+.. _.rowcount:
+
+`.rowcount`_
+    This read-only attribute specifies the number of rows that the last
+    `.execute*()`_ produced (for DQL statements like ``SELECT``) or affected
+    (for DML statements like ``UPDATE`` or ``INSERT``). [9]_
+
+    The attribute is -1 in case no `.execute*()`_ has been performed
+    on the cursor or the rowcount of the last operation is cannot be
+    determined by the interface. [7]_
+
+    .. note::
+        Future versions of the DB API specification could redefine the
+        latter case to have the object return ``None`` instead of -1.
+
+
+`Cursor methods`_
+-----------------
+
+.. _.callproc:
+.. _.callproc():
+
+`.callproc`_\ ( *procname* [, *parameters* ] )
+    (This method is optional since not all databases provide stored
+    procedures. [3]_)
+
+    Call a stored database procedure with the given name. The sequence
+    of parameters must contain one entry for each argument that the
+    procedure expects. The result of the call is returned as modified
+    copy of the input sequence. Input parameters are left untouched,
+    output and input/output parameters replaced with possibly new
+    values.
+
+    The procedure may also provide a result set as output. This must
+    then be made available through the standard `.fetch*()`_ methods.
+
+
+.. .close:
+.. _Cursor.close:
+.. _Cursor.close():
+
+`.close <#Cursor.close>`_\ ()
+    Close the cursor now (rather than whenever ``__del__`` is called).
+
+    The cursor will be unusable from this point forward; an Error_ (or
+    subclass) exception will be raised if any operation is attempted
+    with the cursor.
+
+
+.. _.execute*:
+.. _.execute*():
+
+.. _.execute:
+.. _.execute():
+
+`.execute`_\ (*operation* [, *parameters*])
+    Prepare and execute a database operation (query or command).
+
+    Parameters may be provided as sequence or mapping and will be
+    bound to variables in the operation.  Variables are specified in a
+    database-specific notation (see the module's paramstyle_ attribute
+    for details). [5]_
+
+    A reference to the operation will be retained by the cursor.  If
+    the same operation object is passed in again, then the cursor can
+    optimize its behavior.  This is most effective for algorithms
+    where the same operation is used, but different parameters are
+    bound to it (many times).
+
+    For maximum efficiency when reusing an operation, it is best to
+    use the `.setinputsizes()`_ method to specify the parameter types
+    and sizes ahead of time.  It is legal for a parameter to not match
+    the predefined information; the implementation should compensate,
+    possibly with a loss of efficiency.
+
+    The parameters may also be specified as list of tuples to
+    e.g. insert multiple rows in a single operation, but this kind of
+    usage is deprecated: `.executemany()`_ should be used instead.
+
+    Return values are not defined.
+
+
+.. _.executemany:
+.. _.executemany():
+
+`.executemany`_\ ( *operation*, *seq_of_parameters* )
+    Prepare a database operation (query or command) and then execute it
+    against all parameter sequences or mappings found in the sequence
+    *seq_of_parameters*.
+
+    Modules are free to implement this method using multiple calls to
+    the `.execute()`_ method or by using array operations to have the
+    database process the sequence as a whole in one call.
+
+    Use of this method for an operation which produces one or more
+    result sets constitutes undefined behavior, and the implementation
+    is permitted (but not required) to raise an exception when it
+    detects that a result set has been created by an invocation of the
+    operation.
+
+    The same comments as for `.execute()`_ also apply accordingly to
+    this method.
+
+    Return values are not defined.
+
+
+.. _.fetch*:
+.. _.fetch*():
+
+.. _.fetchone:
+.. _.fetchone():
+
+`.fetchone`_\ ()
+    Fetch the next row of a query result set, returning a single
+    sequence, or ``None`` when no more data is available. [6]_
+
+    An Error_ (or subclass) exception is raised if the previous call
+    to `.execute*()`_ did not produce any result set or no call was
+    issued yet.
+
+
+.. _.fetchmany:
+.. _.fetchmany():
+
+`.fetchmany`_\ ([*size=cursor.arraysize*])
+    Fetch the next set of rows of a query result, returning a sequence
+    of sequences (e.g. a list of tuples). An empty sequence is
+    returned when no more rows are available.
+
+    The number of rows to fetch per call is specified by the
+    parameter.  If it is not given, the cursor's arraysize determines
+    the number of rows to be fetched. The method should try to fetch
+    as many rows as indicated by the size parameter. If this is not
+    possible due to the specified number of rows not being available,
+    fewer rows may be returned.
+
+    An Error_ (or subclass) exception is raised if the previous call
+    to `.execute*()`_ did not produce any result set or no call was
+    issued yet.
+
+    Note there are performance considerations involved with the *size*
+    parameter.  For optimal performance, it is usually best to use the
+    `.arraysize`_ attribute.  If the size parameter is used, then it
+    is best for it to retain the same value from one `.fetchmany()`_
+    call to the next.
+
+
+.. _.fetchall:
+.. _.fetchall():
+
+`.fetchall`_\ ()
+    Fetch all (remaining) rows of a query result, returning them as a
+    sequence of sequences (e.g. a list of tuples).  Note that the
+    cursor's arraysize attribute can affect the performance of this
+    operation.
+
+    An Error_ (or subclass) exception is raised if the previous call
+    to `.execute*()`_ did not produce any result set or no call was
+    issued yet.
+
+
+.. _.nextset:
+.. _.nextset():
+
+`.nextset`_\ ()
+    (This method is optional since not all databases support multiple
+    result sets. [3]_)
+
+    This method will make the cursor skip to the next available set,
+    discarding any remaining rows from the current set.
+
+    If there are no more sets, the method returns ``None``. Otherwise,
+    it returns a true value and subsequent calls to the `.fetch*()`_
+    methods will return rows from the next result set.
+
+    An Error_ (or subclass) exception is raised if the previous call
+    to `.execute*()`_ did not produce any result set or no call was
+    issued yet.
+
+
+.. _.arraysize:
+
+`.arraysize`_
+    This read/write attribute specifies the number of rows to fetch at
+    a time with `.fetchmany()`_. It defaults to 1 meaning to fetch a
+    single row at a time.
+
+    Implementations must observe this value with respect to the
+    `.fetchmany()`_ method, but are free to interact with the database
+    a single row at a time. It may also be used in the implementation
+    of `.executemany()`_.
+
+
+.. _.setinputsizes:
+.. _.setinputsizes():
+
+`.setinputsizes`_\ (*sizes*)
+    This can be used before a call to `.execute*()`_ to predefine
+    memory areas for the operation's parameters.
+
+    *sizes* is specified as a sequence ? one item for each input
+    parameter.  The item should be a Type Object that corresponds to
+    the input that will be used, or it should be an integer specifying
+    the maximum length of a string parameter.  If the item is
+    ``None``, then no predefined memory area will be reserved for that
+    column (this is useful to avoid predefined areas for large
+    inputs).
+
+    This method would be used before the `.execute*()`_ method is
+    invoked.
+
+    Implementations are free to have this method do nothing and users
+    are free to not use it.
+
+
+.. _.setoutputsize:
+.. _.setoutputsize():
+
+`.setoutputsize`_\ (*size* [, *column*])
+    Set a column buffer size for fetches of large columns
+    (e.g. ``LONG``\s, ``BLOB``\s, etc.).  The column is specified as
+    an index into the result sequence.  Not specifying the column will
+    set the default size for all large columns in the cursor.
+
+    This method would be used before the `.execute*()`_ method is
+    invoked.
+
+    Implementations are free to have this method do nothing and users
+    are free to not use it.
+
+
+.. _Type Objects:
+
+`Type Objects and Constructors`_
+================================
+
+Many databases need to have the input in a particular format for
+binding to an operation's input parameters.  For example, if an input
+is destined for a ``DATE`` column, then it must be bound to the
+database in a particular string format.  Similar problems exist for
+"Row ID" columns or large binary items (e.g. blobs or ``RAW``
+columns).  This presents problems for Python since the parameters to
+the `.execute*()`_ method are untyped.  When the database module sees
+a Python string object, it doesn't know if it should be bound as a
+simple ``CHAR`` column, as a raw ``BINARY`` item, or as a ``DATE``.
+
+To overcome this problem, a module must provide the constructors
+defined below to create objects that can hold special values.  When
+passed to the cursor methods, the module can then detect the proper
+type of the input parameter and bind it accordingly.
+
+A Cursor_ Object's description attribute returns information about
+each of the result columns of a query.  The ``type_code`` must compare
+equal to one of Type Objects defined below. Type Objects may be equal
+to more than one type code (e.g. ``DATETIME`` could be equal to the
+type codes for date, time and timestamp columns; see the
+`Implementation Hints`_ below for details).
+
+The module exports the following constructors and singletons:
+
+.. _Date:
+
+`Date`_\ (*year*, *month*, *day*)
+    This function constructs an object holding a date value.
+
+
+.. _Time:
+
+`Time`_\ (*hour*, *minute*, *second*)
+    This function constructs an object holding a time value.
+
+
+.. _Timestamp:
+
+`Timestamp`_\ (*year*, *month*, *day*, *hour*, *minute*, *second*)
+    This function constructs an object holding a time stamp value.
+
+
+.. _DateFromTicks:
+
+`DateFromTicks`_\ (*ticks*)
+    This function constructs an object holding a date value from the
+    given ticks value (number of seconds since the epoch; see the
+    documentation of `the standard Python time module
+    <http://docs.python.org/library/time.html>`__ for details).
+
+.. _TimeFromTicks:
+
+`TimeFromTicks`_\ (*ticks*)
+    This function constructs an object holding a time value from the
+    given ticks value (number of seconds since the epoch; see the
+    documentation of the standard Python time module for details).
+
+
+.. _TimeStampFromTicks:
+
+`TimestampFromTicks`_\ (*ticks*)
+    This function constructs an object holding a time stamp value from
+    the given ticks value (number of seconds since the epoch; see the
+    documentation of the standard Python time module for details).
+
+
+.. _Binary:
+
+`Binary`_\ (*string*)
+    This function constructs an object capable of holding a binary
+    (long) string value.
+
+
+.. _STRING:
+
+`STRING`_ type
+    This type object is used to describe columns in a database that
+    are string-based (e.g. ``CHAR``).
+
+
+.. _Binary type:
+
+`BINARY`_ type
+    This type object is used to describe (long) binary columns in a
+    database (e.g. ``LONG``, ``RAW``, ``BLOB``\s).
+
+
+.. _NUMBER:
+
+`NUMBER`_ type
+    This type object is used to describe numeric columns in a
+    database.
+
+
+.. _DATETIME:
+
+`DATETIME`_ type
+    This type object is used to describe date/time columns in a
+    database.
+
+.. _ROWID:
+
+`ROWID`_ type
+    This type object is used to describe the "Row ID" column in a
+    database.
+
+
+SQL ``NULL`` values are represented by the Python ``None`` singleton
+on input and output.
+
+.. Note::
+    Usage of Unix ticks for database interfacing can cause troubles
+    because of the limited date range they cover.
+
+
+
+.. _Implementation Hints:
+
+`Implementation Hints for Module Authors`_
+==========================================
+
+* Date/time objects can be implemented as `Python datetime module
+  <http://docs.python.org/library/datetime.html>`__ objects (available
+  since Python 2.3, with a C API since 2.4) or using the `mxDateTime
+  <http://www.egenix.com/products/python/mxBase/mxDateTime/>`_ package
+  (available for all Python versions since 1.5.2). They both provide
+  all necessary constructors and methods at Python and C level.
+
+* Here is a sample implementation of the Unix ticks based constructors
+  for date/time delegating work to the generic constructors::
 
         import time
 
@@ -599,17 +706,15 @@
         def TimestampFromTicks(ticks):
             return Timestamp(*time.localtime(ticks)[:6])
 
-    * The preferred object type for Binary objects are the
-      buffer types available in standard Python starting with
-      version 1.5.2. Please see the Python documentation for
-      details. For information about the C interface have a
-      look at Include/bufferobject.h and
-      Objects/bufferobject.c in the Python source
-      distribution.
+* The preferred object type for Binary objects are the buffer types
+  available in standard Python starting with version 1.5.2.  Please
+  see the Python documentation for details. For information about the
+  C interface have a look at ``Include/bufferobject.h`` and
+  ``Objects/bufferobject.c`` in the Python source distribution.
 
-    * This Python class allows implementing the above type
-      objects even though the description type code field yields
-      multiple values for on type object:
+* This Python class allows implementing the above type objects even
+  though the description type code field yields multiple values for on
+  type object::
 
         class DBAPITypeObject:
             def __init__(self,*values):
@@ -622,11 +727,11 @@
                 else:
                     return -1
 
-      The resulting type object compares equal to all values
-      passed to the constructor.
+  The resulting type object compares equal to all values passed to the
+  constructor.
 
-    * Here is a snippet of Python code that implements the exception
-      hierarchy defined above:
+* Here is a snippet of Python code that implements the exception
+  hierarchy defined above::
 
         import exceptions
 
@@ -659,490 +764,555 @@
 
         class NotSupportedError(DatabaseError):
             pass
-        
-      In C you can use the PyErr_NewException(fullname,
-      base, NULL) API to create the exception objects.
 
+  In C you can use the ``PyErr_NewException(fullname, base, NULL)``
+  API to create the exception objects.
 
-Optional DB API Extensions
 
-    During the lifetime of DB API 2.0, module authors have often
-    extended their implementations beyond what is required by this DB
-    API specification. To enhance compatibility and to provide a clean
-    upgrade path to possible future versions of the specification,
-    this section defines a set of common extensions to the core DB API
-    2.0 specification.
+`Optional DB API Extensions`_
+=============================
 
-    As with all DB API optional features, the database module authors
-    are free to not implement these additional attributes and methods
-    (using them will then result in an AttributeError) or to raise a
-    NotSupportedError in case the availability can only be checked at
-    run-time.
+During the lifetime of DB API 2.0, module authors have often extended
+their implementations beyond what is required by this DB API
+specification. To enhance compatibility and to provide a clean upgrade
+path to possible future versions of the specification, this section
+defines a set of common extensions to the core DB API 2.0
+specification.
 
-    It has been proposed to make usage of these extensions optionally
-    visible to the programmer by issuing Python warnings through the
-    Python warning framework. To make this feature useful, the warning
-    messages must be standardized in order to be able to mask
-    them. These standard messages are referred to below as "Warning
-    Message".
+As with all DB API optional features, the database module authors are
+free to not implement these additional attributes and methods (using
+them will then result in an ``AttributeError``) or to raise a
+NotSupportedError_ in case the availability can only be checked at
+run-time.
 
-    Cursor Attribute .rownumber
+It has been proposed to make usage of these extensions optionally
+visible to the programmer by issuing Python warnings through the
+Python warning framework. To make this feature useful, the warning
+messages must be standardized in order to be able to mask them. These
+standard messages are referred to below as *Warning Message*.
 
-        This read-only attribute should provide the current 0-based
-        index of the cursor in the result set or None if the index
-        cannot be determined.
 
-        The index can be seen as index of the cursor in a sequence
-        (the result set). The next fetch operation will fetch the row
-        indexed by .rownumber in that sequence.
+.. _.rownumber:
 
-        Warning Message: "DB-API extension cursor.rownumber used"
+Cursor\ `.rownumber`_
+    This read-only attribute should provide the current 0-based index
+    of the cursor in the result set or ``None`` if the index cannot be
+    determined.
 
-    Connection Attributes .Error, .ProgrammingError, etc.
+    The index can be seen as index of the cursor in a sequence (the
+    result set). The next fetch operation will fetch the row indexed
+    by `.rownumber`_ in that sequence.
 
-        All exception classes defined by the DB API standard should be
-        exposed on the Connection objects as attributes (in addition
-        to being available at module scope).
+    *Warning Message:* "DB-API extension cursor.rownumber used"
 
-        These attributes simplify error handling in multi-connection
-        environments.
 
-        Warning Message: "DB-API extension connection.<exception> used"
+.. _Connection.Error:
+.. _Connection.ProgrammingError:
 
-    Cursor Attributes .connection
+`Connection.Error`_, `Connection.ProgrammingError`_, etc.
+    All exception classes defined by the DB API standard should be
+    exposed on the Connection_ objects as attributes (in addition to
+    being available at module scope).
 
-        This read-only attribute return a reference to the Connection
-        object on which the cursor was created.
+    These attributes simplify error handling in multi-connection
+    environments.
 
-        The attribute simplifies writing polymorph code in
-        multi-connection environments.
+    *Warning Message:* "DB-API extension connection.<exception> used"
 
-        Warning Message: "DB-API extension cursor.connection used"
 
-    Cursor Method .scroll(value[,mode='relative'])
+.. _.connection:
 
-        Scroll the cursor in the result set to a new position according
-        to mode.
+Cursor\ `.connection`_
+    This read-only attribute return a reference to the Connection_
+    object on which the cursor was created.
 
-        If mode is 'relative' (default), value is taken as offset to
-        the current position in the result set, if set to 'absolute',
-        value states an absolute target position.
+    The attribute simplifies writing polymorph code in
+    multi-connection environments.
 
-        An IndexError should be raised in case a scroll operation would
-        leave the result set. In this case, the cursor position is left
-        undefined (ideal would be to not move the cursor at all).
+    *Warning Message:* "DB-API extension cursor.connection used"
 
-        Note: This method should use native scrollable cursors, if
-        available , or revert to an emulation for forward-only
-        scrollable cursors. The method may raise NotSupportedErrors to
-        signal that a specific operation is not supported by the
-        database (e.g. backward scrolling).
 
-        Warning Message: "DB-API extension cursor.scroll() used"
+.. _.scroll:
+.. _.scroll():
 
-    Cursor Attribute .messages
+Cursor\ `.scroll`_\ (*value* [, *mode='relative'* ])
+    Scroll the cursor in the result set to a new position according to
+    *mode*.
 
-        This is a Python list object to which the interface appends
-        tuples (exception class, exception value) for all messages
-        which the interfaces receives from the underlying database for
-        this cursor.
+    If mode is ``relative`` (default), value is taken as offset to the
+    current position in the result set, if set to ``absolute``, value
+    states an absolute target position.
 
-        The list is cleared by all standard cursor methods calls (prior
-        to executing the call) except for the .fetch*() calls
-        automatically to avoid excessive memory usage and can also be
-        cleared by executing "del cursor.messages[:]".
+    An ``IndexError`` should be raised in case a scroll operation
+    would leave the result set. In this case, the cursor position is
+    left undefined (ideal would be to not move the cursor at all).
 
-        All error and warning messages generated by the database are
-        placed into this list, so checking the list allows the user to
-        verify correct operation of the method calls.
+    .. Note::
+        This method should use native scrollable cursors, if available
+        , or revert to an emulation for forward-only scrollable
+        cursors. The method may raise NotSupportedError_ to signal
+        that a specific operation is not supported by the database
+        (e.g. backward scrolling).
 
-        The aim of this attribute is to eliminate the need for a
-        Warning exception which often causes problems (some warnings
-        really only have informational character).
+    *Warning Message:* "DB-API extension cursor.scroll() used"
 
-        Warning Message: "DB-API extension cursor.messages used"
 
-    Connection Attribute .messages
+.. _Cursor.messages:
 
-        Same as cursor.messages except that the messages in the list
-        are connection oriented.
+`Cursor.messages`_
+    This is a Python list object to which the interface appends tuples
+    (exception class, exception value) for all messages which the
+    interfaces receives from the underlying database for this cursor.
 
-        The list is cleared automatically by all standard connection
-        methods calls (prior to executing the call) to avoid excessive
-        memory usage and can also be cleared by executing "del
-        connection.messages[:]".
+    The list is cleared by all standard cursor methods calls (prior to
+    executing the call) except for the `.fetch*()`_ calls
+    automatically to avoid excessive memory usage and can also be
+    cleared by executing ``del cursor.messages[:]``.
 
-        Warning Message: "DB-API extension connection.messages used"
+    All error and warning messages generated by the database are
+    placed into this list, so checking the list allows the user to
+    verify correct operation of the method calls.
 
-    Cursor Method .next()
- 
-        Return the next row from the currently executing SQL statement
-        using the same semantics as .fetchone().  A StopIteration
-        exception is raised when the result set is exhausted for Python
-        versions 2.2 and later. Previous versions don't have the
-        StopIteration exception and so the method should raise an
-        IndexError instead.
+    The aim of this attribute is to eliminate the need for a Warning
+    exception which often causes problems (some warnings really only
+    have informational character).
 
-        Warning Message: "DB-API extension cursor.next() used"
+    *Warning Message:* "DB-API extension cursor.messages used"
 
-    Cursor Method .__iter__()
 
-        Return self to make cursors compatible to the iteration
-        protocol [8].
+.. _Connection.messages:
 
-        Warning Message: "DB-API extension cursor.__iter__() used"
+`Connection.messages`_
+    Same as Cursor.messages_ except that the messages in the list are
+    connection oriented.
 
-    Cursor Attribute .lastrowid
+    The list is cleared automatically by all standard connection
+    methods calls (prior to executing the call) to avoid excessive
+    memory usage and can also be cleared by executing ``del
+    connection.messages[:]``.
 
-        This read-only attribute provides the rowid of the last
-        modified row (most databases return a rowid only when a single
-        INSERT operation is performed). If the operation does not set
-        a rowid or if the database does not support rowids, this
-        attribute should be set to None.
+    *Warning Message:* "DB-API extension connection.messages used"
 
-        The semantics of .lastrowid are undefined in case the last
-        executed statement modified more than one row, e.g. when
-        using INSERT with .executemany().
 
-        Warning Message: "DB-API extension cursor.lastrowid used"
+.. _.next:
+.. _.next():
 
-        
-Optional Error Handling Extensions
+Cursor\ `.next`_\ ()
+    Return the next row from the currently executing SQL statement
+    using the same semantics as `.fetchone()`_.  A ``StopIteration``
+    exception is raised when the result set is exhausted for Python
+    versions 2.2 and later.  Previous versions don't have the
+    ``StopIteration`` exception and so the method should raise an
+    ``IndexError`` instead.
 
-    The core DB API specification only introduces a set of exceptions
-    which can be raised to report errors to the user. In some cases,
-    exceptions may be too disruptive for the flow of a program or even
-    render execution impossible. 
+    *Warning Message:* "DB-API extension cursor.next() used"
 
-    For these cases and in order to simplify error handling when
-    dealing with databases, database module authors may choose to
-    implement user defineable error handlers. This section describes a
-    standard way of defining these error handlers.
 
-    Cursor/Connection Attribute .errorhandler
+.. _.__iter__:
+.. _.__iter__():
 
-        Read/write attribute which references an error handler to call
-        in case an error condition is met.
+Cursor\ `.__iter__`_\ ()
+    Return self to make cursors compatible to the iteration protocol
+    [8]_.
 
-        The handler must be a Python callable taking the following
-        arguments:
+    *Warning Message:* "DB-API extension cursor.__iter__() used"
 
-          errorhandler(connection, cursor, errorclass, errorvalue) 
 
-        where connection is a reference to the connection on which the
-        cursor operates, cursor a reference to the cursor (or None in
-        case the error does not apply to a cursor), errorclass is an
-        error class which to instantiate using errorvalue as
-        construction argument.
+.. _.lastrowid:
 
-        The standard error handler should add the error information to
-        the appropriate .messages attribute (connection.messages or
-        cursor.messages) and raise the exception defined by the given
-        errorclass and errorvalue parameters.
+Cursor\ `.lastrowid`_
+    This read-only attribute provides the rowid of the last modified
+    row (most databases return a rowid only when a single ``INSERT``
+    operation is performed). If the operation does not set a rowid or
+    if the database does not support rowids, this attribute should be
+    set to ``None``.
 
-        If no errorhandler is set (the attribute is None), the
-        standard error handling scheme as outlined above, should be
-        applied.
+    The semantics of ``.lastrowid`` are undefined in case the last
+    executed statement modified more than one row, e.g. when using
+    ``INSERT`` with ``.executemany()``.
 
-        Warning Message: "DB-API extension .errorhandler used"
+    *Warning Message:* "DB-API extension cursor.lastrowid used"
 
-    Cursors should inherit the .errorhandler setting from their
-    connection objects at cursor creation time.
 
+`Optional Error Handling Extensions`_
+=====================================
 
-Optional Two-Phase Commit Extensions
+The core DB API specification only introduces a set of exceptions
+which can be raised to report errors to the user. In some cases,
+exceptions may be too disruptive for the flow of a program or even
+render execution impossible.
 
-    Many databases have support for two-phase commit (TPC) which
-    allows managing transactions across multiple database connections
-    and other resources.
+For these cases and in order to simplify error handling when dealing
+with databases, database module authors may choose to implement user
+defineable error handlers. This section describes a standard way of
+defining these error handlers.
 
-    If a database backend provides support for two-phase commit and
-    the database module author wishes to expose this support, the
-    following API should be implemented. NotSupportedError should be
-    raised, if the database backend support for two-phase commit
-    can only be checked at run-time.
+.. _Connection.errorhandler:
+.. _Cursor.errorhandler:
 
-    TPC Transaction IDs
+`Connection.errorhandler`_, `Cursor.errorhandler`_
+    Read/write attribute which references an error handler to call in
+    case an error condition is met.
 
-        As many databases follow the XA specification, transaction IDs
-        are formed from three components:
-    
-         * a format ID
-         * a global transaction ID
-         * a branch qualifier
+    The handler must be a Python callable taking the following arguments:
 
-        For a particular global transaction, the first two components
-        should be the same for all resources.  Each resource in the
-        global transaction should be assigned a different branch
-        qualifier.
+    .. parsed-literal::
 
-        The various components must satisfy the following criteria:
-    
-         * format ID: a non-negative 32-bit integer.
-    
-         * global transaction ID and branch qualifier: byte strings no
-           longer than 64 characters.
+        errorhandler(*connection*, *cursor*, *errorclass*, *errorvalue*)
 
-        Transaction IDs are created with the .xid() connection method:
+    where connection is a reference to the connection on which the
+    cursor operates, cursor a reference to the cursor (or ``None`` in
+    case the error does not apply to a cursor), *errorclass* is an
+    error class which to instantiate using *errorvalue* as
+    construction argument.
 
-        .xid(format_id, global_transaction_id, branch_qualifier)
+    The standard error handler should add the error information to the
+    appropriate ``.messages`` attribute (`Connection.messages`_ or
+    `Cursor.messages`_) and raise the exception defined by the given
+    *errorclass* and *errorvalue* parameters.
 
-            Returns a transaction ID object suitable for passing to the
-            .tpc_*() methods of this connection.
+    If no ``.errorhandler`` is set (the attribute is ``None``), the
+    standard error handling scheme as outlined above, should be
+    applied.
 
-            If the database connection does not support TPC, a
-            NotSupportedError is raised.
+    *Warning Message:* "DB-API extension .errorhandler used"
 
-        The type of the object returned by .xid() is not defined, but
-        it must provide sequence behaviour, allowing access to the
-        three components.  A conforming database module could choose
-        to represent transaction IDs with tuples rather than a custom
-        object.
+Cursors should inherit the ``.errorhandler`` setting from their
+connection objects at cursor creation time.
 
-    TPC Connection Methods
 
-    .tpc_begin(xid)
+`Optional Two-Phase Commit Extensions`_
+=======================================
 
-        Begins a TPC transaction with the given transaction ID xid.
+Many databases have support for two-phase commit (TPC) which allows
+managing transactions across multiple database connections and other
+resources.
 
-        This method should be called outside of a transaction
-        (i.e. nothing may have executed since the last .commit() or
-        .rollback()).
+If a database backend provides support for two-phase commit and the
+database module author wishes to expose this support, the following
+API should be implemented. NotSupportedError_ should be raised, if the
+database backend support for two-phase commit can only be checked at
+run-time.
 
-        Furthermore, it is an error to call .commit() or .rollback()
-        within the TPC transaction. A ProgrammingError is raised, if
-        the application calls .commit() or .rollback() during an
-        active TPC transaction.
+`TPC Transaction IDs`_
+----------------------
 
-        If the database connection does not support TPC, a
-        NotSupportedError is raised.
+As many databases follow the XA specification, transaction IDs are
+formed from three components:
 
-    .tpc_prepare()
+* a format ID
+* a global transaction ID
+* a branch qualifier
 
-        Performs the first phase of a transaction started with
-        .tpc_begin().  A ProgrammingError should be raised if this
-        method outside of a TPC transaction.
+For a particular global transaction, the first two components should
+be the same for all resources.  Each resource in the global
+transaction should be assigned a different branch qualifier.
 
-        After calling .tpc_prepare(), no statements can be executed
-        until tpc_commit() or tpc_rollback() have been called.
+The various components must satisfy the following criteria:
 
-    .tpc_commit([xid])
+* format ID: a non-negative 32-bit integer.
 
-        When called with no arguments, .tpc_commit() commits a TPC
-        transaction previously prepared with .tpc_prepare().
+* global transaction ID and branch qualifier: byte strings no
+  longer than 64 characters.
 
-        If .tpc_commit() is called prior to .tpc_prepare(), a single
-        phase commit is performed.  A transaction manager may choose
-        to do this if only a single resource is participating in the
-        global transaction.
+Transaction IDs are created with the `.xid()`_ Connection method:
 
-        When called with a transaction ID xid, the database commits
-        the given transaction.  If an invalid transaction ID is
-        provided, a ProgrammingError will be raised.  This form should
-        be called outside of a transaction, and is intended for use in
-        recovery.
 
-        On return, the TPC transaction is ended.
+.. _.xid:
+.. _.xid():
 
-    .tpc_rollback([xid])
+`.xid`_\ (*format_id*, *global_transaction_id*, *branch_qualifier*)
+    Returns a transaction ID object suitable for passing to the
+    `.tpc_*()`_ methods of this connection.
 
-        When called with no arguments, .tpc_rollback() rolls back a
-        TPC transaction.  It may be called before or after
-        .tpc_prepare().
+    If the database connection does not support TPC, a
+    NotSupportedError_ is raised.
 
-        When called with a transaction ID xid, it rolls back the given
-        transaction.  If an invalid transaction ID is provided, a
-        ProgrammingError is raised.  This form should be called
-        outside of a transaction, and is intended for use in recovery.
+    The type of the object returned by `.xid()`_ is not defined, but
+    it must provide sequence behaviour, allowing access to the three
+    components.  A conforming database module could choose to
+    represent transaction IDs with tuples rather than a custom object.
 
-        On return, the TPC transaction is ended.
 
-    .tpc_recover()
+`TPC Connection Methods`_
+-------------------------
 
-        Returns a list of pending transaction IDs suitable for use
-        with .tpc_commit(xid) or .tpc_rollback(xid).
+.. _.tpc_*:
+.. _.tpc_*():
 
-        If the database does not support transaction recovery, it may
-        return an empty list or raise NotSupportedError.
+.. _.tpc_begin:
+.. _.tpc_begin():
 
+`.tpc_begin`_\ (*xid*)
+    Begins a TPC transaction with the given transaction ID *xid*.
 
-Frequently Asked Questions
+    This method should be called outside of a transaction (*i.e.*
+    nothing may have executed since the last `.commit()`_ or
+    `.rollback()`_).
 
-    The database SIG often sees reoccurring questions about the DB API
-    specification. This section covers some of the issues people
-    sometimes have with the specification.
+    Furthermore, it is an error to call `.commit()`_ or `.rollback()`_
+    within the TPC transaction. A ProgrammingError_ is raised, if the
+    application calls `.commit()`_ or `.rollback()`_ during an active
+    TPC transaction.
 
-    Question: 
+    If the database connection does not support TPC, a
+    NotSupportedError_ is raised.
 
-       How can I construct a dictionary out of the tuples returned by
-       .fetch*():
 
-    Answer:
+.. _.tpc_prepare:
+.. _.tpc_prepare():
 
-       There are several existing tools available which provide
-       helpers for this task. Most of them use the approach of using
-       the column names defined in the cursor attribute .description
-       as basis for the keys in the row dictionary.
+`.tpc_prepare`_\ ()
+    Performs the first phase of a transaction started with
+    `.tpc_begin()`_.  A ProgrammingError_ should be raised if this
+    method outside of a TPC transaction.
 
-       Note that the reason for not extending the DB API specification
-       to also support dictionary return values for the .fetch*()
-       methods is that this approach has several drawbacks:
+    After calling `.tpc_prepare()`_, no statements can be executed
+    until `.tpc_commit()`_ or `.tpc_rollback()`_ have been called.
 
-       * Some databases don't support case-sensitive column names or
-         auto-convert them to all lowercase or all uppercase
-         characters.
- 
-       * Columns in the result set which are generated by the query
-         (e.g.  using SQL functions) don't map to table column names
-         and databases usually generate names for these columns in a
-         very database specific way.
 
-       As a result, accessing the columns through dictionary keys
-       varies between databases and makes writing portable code
-       impossible.
+.. _.tpc_commit:
+.. _.tpc_commit():
 
+`.tpc_commit`_\ ([ *xid* ])
+    When called with no arguments, `.tpc_commit()`_ commits a TPC
+    transaction previously prepared with `.tpc_prepare()`_.
 
-Major Changes from Version 1.0 to Version 2.0
+    If `.tpc_commit()`_ is called prior to `.tpc_prepare()`_, a single
+    phase commit is performed.  A transaction manager may choose to do
+    this if only a single resource is participating in the global
+    transaction.
 
-    The Python Database API 2.0 introduces a few major changes
-    compared to the 1.0 version. Because some of these changes will
-    cause existing DB API 1.0 based scripts to break, the major
-    version number was adjusted to reflect this change.
-        
-    These are the most important changes from 1.0 to 2.0:
-        
-        * The need for a separate dbi module was dropped and the
-          functionality merged into the module interface itself.
+    When called with a transaction ID *xid*, the database commits the
+    given transaction.  If an invalid transaction ID is provided, a
+    ProgrammingError_ will be raised.  This form should be called
+    outside of a transaction, and is intended for use in recovery.
 
-        * New constructors and Type Objects were added for date/time
-          values, the RAW Type Object was renamed to BINARY. The
-          resulting set should cover all basic data types commonly
-          found in modern SQL databases.
+    On return, the TPC transaction is ended.
 
-        * New constants (apilevel, threadlevel, paramstyle) and
-          methods (.executemany(), .nextset()) were added to provide
-          better database bindings.
-            
-        * The semantics of .callproc() needed to call stored
-          procedures are now clearly defined.
-            
-        * The definition of the .execute() return value changed.
-          Previously, the return value was based on the SQL statement
-          type (which was hard to implement right) -- it is undefined
-          now; use the more flexible .rowcount attribute
-          instead. Modules are free to return the old style return
-          values, but these are no longer mandated by the
-          specification and should be considered database interface
-          dependent.
-            
-        * Class based exceptions were incorporated into the
-          specification.  Module implementors are free to extend the
-          exception layout defined in this specification by
-          subclassing the defined exception classes.
 
-    Post-publishing additions to the DB API 2.0 specification:
+.. _.tpc_rollback:
+.. _.tpc_rollback():
 
-        * Additional optional DB API extensions to the set of
-          core functionality were specified.
+`.tpc_rollback`_\ ([ *xid* ])
+    When called with no arguments, `.tpc_rollback()`_ rolls back a TPC
+    transaction.  It may be called before or after `.tpc_prepare()`_.
 
+    When called with a transaction ID *xid*, it rolls back the given
+    transaction.  If an invalid transaction ID is provided, a
+    ProgrammingError_ is raised.  This form should be called outside
+    of a transaction, and is intended for use in recovery.
 
-Open Issues
+    On return, the TPC transaction is ended.
 
-    Although the version 2.0 specification clarifies a lot of
-    questions that were left open in the 1.0 version, there are still
-    some remaining issues which should be addressed in future
-    versions:
-        
-        * Define a useful return value for .nextset() for the case where
-          a new result set is available.
-        
-        * Integrate the decimal module Decimal object for use as
-          loss-less monetary and decimal interchange format.
+.. _.tpc_recover:
+.. _.tpc_recover():
 
+`.tpc_recover`_\ ()
+    Returns a list of pending transaction IDs suitable for use with
+    ``.tpc_commit(xid)`` or ``.tpc_rollback(xid)``.
 
-Footnotes
+    If the database does not support transaction recovery, it may
+    return an empty list or raise NotSupportedError_.
 
-    [1] As a guideline the connection constructor parameters should be
-        implemented as keyword parameters for more intuitive use and
-        follow this order of parameters:
-        
-          dsn         Data source name as string
-          user        User name as string (optional)
-          password    Password as string (optional)
-          host        Hostname (optional)
-          database    Database name (optional)
-        
-        E.g. a connect could look like this:
-        
-          connect(dsn='myhost:MYDB',user='guido',password='234$')
-        
-    [2] Module implementors should prefer 'numeric', 'named' or
-        'pyformat' over the other formats because these offer more
-        clarity and flexibility.
 
-    [3] If the database does not support the functionality required
-        by the method, the interface should throw an exception in
-        case the method is used.
-        
-        The preferred approach is to not implement the method and
-        thus have Python generate an AttributeError in
-        case the method is requested. This allows the programmer to
-        check for database capabilities using the standard
-        hasattr() function.
-        
-        For some dynamically configured interfaces it may not be
-        appropriate to require dynamically making the method
-        available. These interfaces should then raise a
-        NotSupportedError to indicate the non-ability
-        to perform the roll back when the method is invoked.
-          
-    [4] a database interface may choose to support named cursors by
-        allowing a string argument to the method. This feature is
-        not part of the specification, since it complicates
-        semantics of the .fetch*() methods.
-        
-    [5] The module will use the __getitem__ method of the parameters
-        object to map either positions (integers) or names (strings)
-        to parameter values. This allows for both sequences and
-        mappings to be used as input.
-        
-        The term "bound" refers to the process of binding an input
-        value to a database execution buffer. In practical terms,
-        this means that the input value is directly used as a value
-        in the operation.  The client should not be required to
-        "escape" the value so that it can be used -- the value
-        should be equal to the actual database value.
-        
-    [6] Note that the interface may implement row fetching using
-        arrays and other optimizations. It is not
-        guaranteed that a call to this method will only move the
-        associated cursor forward by one row.
-       
-    [7] The rowcount attribute may be coded in a way that updates
-        its value dynamically. This can be useful for databases that
-        return usable rowcount values only after the first call to
-        a .fetch*() method.
 
-    [8] Implementation Note: Python C extensions will have to
-        implement the tp_iter slot on the cursor object instead of the
-        .__iter__() method.
+`Frequently Asked Questions`_
+=============================
 
-Acknowledgements
+The database SIG often sees reoccurring questions about the DB API
+specification. This section covers some of the issues people sometimes
+have with the specification.
 
-    Many thanks go to Andrew Kuchling who converted the Python
-    Database API Specification 2.0 from the original HTML format into
-    the PEP format.
+**Question:**
 
-    Many thanks to James Henstridge for leading the discussion which
-    led to the standardization of the two-phase commit API extensions.
+How can I construct a dictionary out of the tuples returned by
+`.fetch*()`_:
 
-Copyright
+**Answer:**
 
-    This document has been placed in the Public Domain.
+There are several existing tools available which provide helpers for
+this task. Most of them use the approach of using the column names
+defined in the cursor attribute `.description`_ as basis for the keys
+in the row dictionary.
 
+Note that the reason for not extending the DB API specification to
+also support dictionary return values for the `.fetch*()`_ methods is
+that this approach has several drawbacks:
 
-
-Local Variables:
-mode: indented-text
-indent-tabs-mode: nil
-End:
+* Some databases don't support case-sensitive column names or
+  auto-convert them to all lowercase or all uppercase characters.
+
+* Columns in the result set which are generated by the query (e.g.
+  using SQL functions) don't map to table column names and databases
+  usually generate names for these columns in a very database specific
+  way.
+
+As a result, accessing the columns through dictionary keys varies
+between databases and makes writing portable code impossible.
+
+
+
+`Major Changes from Version 1.0 to Version 2.0`_
+================================================
+
+The Python Database API 2.0 introduces a few major changes compared to
+the 1.0 version. Because some of these changes will cause existing DB
+API 1.0 based scripts to break, the major version number was adjusted
+to reflect this change.
+
+These are the most important changes from 1.0 to 2.0:
+
+* The need for a separate dbi module was dropped and the functionality
+  merged into the module interface itself.
+
+* New constructors and `Type Objects`_ were added for date/time
+  values, the ``RAW`` Type Object was renamed to ``BINARY``. The
+  resulting set should cover all basic data types commonly found in
+  modern SQL databases.
+
+* New constants (apilevel_, threadsafety_, paramstyle_) and methods
+  (`.executemany()`_, `.nextset()`_) were added to provide better
+  database bindings.
+
+* The semantics of `.callproc()`_ needed to call stored procedures are
+  now clearly defined.
+
+* The definition of the `.execute()`_ return value changed.
+  Previously, the return value was based on the SQL statement type
+  (which was hard to implement right) ? it is undefined now; use the
+  more flexible `.rowcount`_ attribute instead. Modules are free to
+  return the old style return values, but these are no longer mandated
+  by the specification and should be considered database interface
+  dependent.
+
+* Class based exceptions_ were incorporated into the specification.
+  Module implementors are free to extend the exception layout defined
+  in this specification by subclassing the defined exception classes.
+
+
+Post-publishing additions to the DB API 2.0 specification:
+
+* Additional optional DB API extensions to the set of core
+  functionality were specified.
+
+
+`Open Issues`_
+==============
+
+Although the version 2.0 specification clarifies a lot of questions
+that were left open in the 1.0 version, there are still some remaining
+issues which should be addressed in future versions:
+
+* Define a useful return value for `.nextset()`_ for the case where a
+  new result set is available.
+
+* Integrate the `decimal module
+  <http://docs.python.org/library/decimal.html>`__ ``Decimal`` object
+  for use as loss-less monetary and decimal interchange format.
+
+
+
+`Footnotes`_
+============
+
+.. [1] As a guideline the connection constructor parameters should be
+    implemented as keyword parameters for more intuitive use and
+    follow this order of parameters:
+
+    ============= ====================================
+    Parameter     Meaning
+    ============= ====================================
+    ``dsn``       Data source name as string
+    ``user``      User name as string (optional)
+    ``password``  Password as string (optional)
+    ``host``      Hostname (optional)
+    ``database``  Database name (optional)
+    ============= ====================================
+
+    E.g. a connect could look like this::
+
+        connect(dsn='myhost:MYDB', user='guido', password='234$')
+
+.. [2] Module implementors should prefer ``numeric``, ``named`` or
+    ``pyformat`` over the other formats because these offer more
+    clarity and flexibility.
+
+
+.. [3] If the database does not support the functionality required by
+    the method, the interface should throw an exception in case the
+    method is used.
+
+    The preferred approach is to not implement the method and thus
+    have Python generate an ``AttributeError`` in case the method is requested. This
+    allows the programmer to check for database capabilities using the
+    standard ``hasattr()`` function.
+
+    For some dynamically configured interfaces it may not be
+    appropriate to require dynamically making the method
+    available. These interfaces should then raise a
+    ``NotSupportedError`` to indicate the non-ability to perform the
+    roll back when the method is invoked.
+
+.. [4] A database interface may choose to support named cursors by
+    allowing a string argument to the method. This feature is not part
+    of the specification, since it complicates semantics of the
+    `.fetch*()`_ methods.
+
+.. [5] The module will use the ``__getitem__`` method of the
+    parameters object to map either positions (integers) or names
+    (strings) to parameter values.  This allows for both sequences and
+    mappings to be used as input.
+
+    The term *bound* refers to the process of binding an input value
+    to a database execution buffer. In practical terms, this means
+    that the input value is directly used as a value in the operation.
+    The client should not be required to "escape" the value so that it
+    can be used ? the value should be equal to the actual database
+    value.
+
+.. [6] Note that the interface may implement row fetching using arrays
+    and other optimizations. It is not guaranteed that a call to this
+    method will only move the associated cursor forward by one row.
+
+.. [7] The ``rowcount`` attribute may be coded in a way that updates
+    its value dynamically. This can be useful for databases that
+    return usable ``rowcount`` values only after the first call to a
+    `.fetch*()`_ method.
+
+.. [8] Implementation Note: Python C extensions will have to implement
+    the ``tp_iter`` slot on the cursor object instead of the
+    ``.__iter__()`` method.
+
+.. [9] The term *number of affected rows* generally refers to the
+    number of rows deleted, updated or inserted by the last statement
+    run on the database cursor. Most databases will return the total
+    number of rows that were found by the corresponding ``WHERE``
+    clause of the statement. Some databases use a different
+    interpretation for ``UPDATE``\s and only return the number of rows
+    that were changed by the ``UPDATE``, even though the ``WHERE``
+    clause of the statement may have found more matching rows.
+    Database module authors should try to implement the more common
+    interpretation of returning the total number of rows found by the
+    ``WHERE`` clause, or clearly document a different interpretation
+    of the ``.rowcount`` attribute.
+
+
+`Acknowledgements`_
+===================
+
+Many thanks go to Andrew Kuchling who converted the Python Database
+API Specification 2.0 from the original HTML format into the PEP
+format.
+
+Many thanks to James Henstridge for leading the discussion which led
+to the standardization of the two-phase commit API extensions.
+
+Many thanks to Daniele Varrazzo for converting the specification from
+text PEP format to ReST PEP format, which allows linking to various
+parts.
+
+`Copyright`_
+============
+
+This document has been placed in the Public Domain.

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

From python-checkins at python.org  Wed Nov  7 09:48:29 2012
From: python-checkins at python.org (hynek.schlawack)
Date: Wed,  7 Nov 2012 09:48:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1MDAx?=
 =?utf-8?b?OiBmaXggc2VnZmF1bHQgb24gImRlbCBzeXMubW9kdWxlc1snX19tYWluX18n?=
 =?utf-8?b?XSI=?=
Message-ID: <3XxLrF12GDzPWM@mail.python.org>

http://hg.python.org/cpython/rev/4ebe1ede981e
changeset:   80292:4ebe1ede981e
branch:      2.7
parent:      80258:1c54def5947c
user:        Hynek Schlawack <hs at ox.cx>
date:        Wed Nov 07 09:41:28 2012 +0100
summary:
  Issue #15001: fix segfault on "del sys.modules['__main__']"

Patch by Victor Stinner.

files:
  Lib/test/test_cmd_line.py |  19 +++++++++++++++++--
  Misc/NEWS                 |   3 +++
  Python/pythonrun.c        |  10 +++++-----
  3 files changed, 25 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -2,9 +2,12 @@
 # All tests are executed with environment variables ignored
 # See test_cmd_line_script.py for testing of script execution
 
-import test.test_support, unittest
+import test.test_support
 import sys
-from test.script_helper import spawn_python, kill_python, python_exit_code
+import unittest
+from test.script_helper import (
+    assert_python_ok, spawn_python, kill_python, python_exit_code
+)
 
 
 class CmdLineTest(unittest.TestCase):
@@ -101,6 +104,18 @@
         data = self.start_python('-R', '-c', code)
         self.assertTrue('hash_randomization=1' in data)
 
+    def test_del___main__(self):
+        # Issue #15001: PyRun_SimpleFileExFlags() did crash because it kept a
+        # borrowed reference to the dict of __main__ module and later modify
+        # the dict whereas the module was destroyed
+        filename = test.test_support.TESTFN
+        self.addCleanup(test.test_support.unlink, filename)
+        with open(filename, "w") as script:
+            print >>script, "import sys"
+            print >>script, "del sys.modules['__main__']"
+        assert_python_ok(filename)
+
+
 def test_main():
     test.test_support.run_unittest(CmdLineTest)
     test.test_support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15001: fix segfault on "del sys.modules['__main__']". Patch by Victor
+  Stinner.
+
 - Issue #5057: the peepholer no longer optimizes subscription on unicode
   literals (e.g. u'foo'[0]) in order to produce compatible pyc files between
   narrow and wide builds.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -907,19 +907,20 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret, len;
+    int set_file_name = 0, len, ret = -1;
 
     m = PyImport_AddModule("__main__");
     if (m == NULL)
         return -1;
+    Py_INCREF(m);
     d = PyModule_GetDict(m);
     if (PyDict_GetItemString(d, "__file__") == NULL) {
         PyObject *f = PyString_FromString(filename);
         if (f == NULL)
-            return -1;
+            goto done;
         if (PyDict_SetItemString(d, "__file__", f) < 0) {
             Py_DECREF(f);
-            return -1;
+            goto done;
         }
         set_file_name = 1;
         Py_DECREF(f);
@@ -932,7 +933,6 @@
             fclose(fp);
         if ((fp = fopen(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
-            ret = -1;
             goto done;
         }
         /* Turn on optimization if a .pyo file is given */
@@ -945,7 +945,6 @@
     }
     if (v == NULL) {
         PyErr_Print();
-        ret = -1;
         goto done;
     }
     Py_DECREF(v);
@@ -955,6 +954,7 @@
   done:
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
+    Py_DECREF(m);
     return ret;
 }
 

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

From python-checkins at python.org  Wed Nov  7 20:26:05 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed,  7 Nov 2012 20:26:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Path=2Ejoin=28=29_is_now_Path?=
	=?utf-8?b?LmpvaW5wYXRoKCk=?=
Message-ID: <3Xxczx4NGzzPxQ@mail.python.org>

http://hg.python.org/peps/rev/05bc7c4d40c0
changeset:   4579:05bc7c4d40c0
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Nov 07 20:06:20 2012 +0100
summary:
  Path.join() is now Path.joinpath()

files:
  pep-0428.txt |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/pep-0428.txt b/pep-0428.txt
--- a/pep-0428.txt
+++ b/pep-0428.txt
@@ -376,10 +376,10 @@
     >>> p['bar', 'xyzzy']
     PurePosixPath('foo/bar/xyzzy')
 
-A join() method is also provided, with the same behaviour.  It can serve
+A joinpath() method is also provided, with the same behaviour.  It can serve
 as a factory function::
 
-    >>> path_factory = p.join
+    >>> path_factory = p.joinpath
     >>> path_factory('bar')
     PurePosixPath('foo/bar')
 

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

From python-checkins at python.org  Wed Nov  7 20:26:06 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed,  7 Nov 2012 20:26:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Replace_subscription_with_sla?=
	=?utf-8?q?shing?=
Message-ID: <3Xxczy6lk8zQFK@mail.python.org>

http://hg.python.org/peps/rev/0879efc1ea42
changeset:   4580:0879efc1ea42
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Nov 07 20:25:27 2012 +0100
summary:
  Replace subscription with slashing

files:
  pep-0428.txt |  12 +++++++-----
  1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/pep-0428.txt b/pep-0428.txt
--- a/pep-0428.txt
+++ b/pep-0428.txt
@@ -360,20 +360,22 @@
 Joining
 ^^^^^^^
 
-A path can be joined with another using the ``__getitem__`` operator::
+A path can be joined with another using the ``/`` operator::
 
     >>> p = PurePosixPath('foo')
-    >>> p['bar']
+    >>> p / 'bar'
     PurePosixPath('foo/bar')
-    >>> p[PurePosixPath('bar')]
+    >>> p / PurePosixPath('bar')
     PurePosixPath('foo/bar')
+    >>> 'bar' / p
+    PurePosixPath('bar/foo')
 
 As with the constructor, multiple path components can be specified, either
 collapsed or separately::
 
-    >>> p['bar/xyzzy']
+    >>> p / 'bar/xyzzy'
     PurePosixPath('foo/bar/xyzzy')
-    >>> p['bar', 'xyzzy']
+    >>> p / 'bar' / 'xyzzy'
     PurePosixPath('foo/bar/xyzzy')
 
 A joinpath() method is also provided, with the same behaviour.  It can serve

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

From python-checkins at python.org  Wed Nov  7 23:21:17 2012
From: python-checkins at python.org (stefan.krah)
Date: Wed,  7 Nov 2012 23:21:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NDMx?=
 =?utf-8?q?=3A_Use_the_type_information_when_constructing_a_Decimal_subtyp?=
 =?utf-8?q?e?=
Message-ID: <3Xxht55HS2zN6v@mail.python.org>

http://hg.python.org/cpython/rev/1b6c972457e6
changeset:   80293:1b6c972457e6
branch:      3.3
parent:      80290:215297665098
user:        Stefan Krah <skrah at bytereef.org>
date:        Wed Nov 07 23:12:25 2012 +0100
summary:
  Issue #16431: Use the type information when constructing a Decimal subtype
from a Decimal argument.

files:
  Lib/test/test_decimal.py    |   5 ++++
  Misc/NEWS                   |   3 ++
  Modules/_decimal/_decimal.c |  29 +++++++++++++++++++++++-
  3 files changed, 35 insertions(+), 2 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
@@ -2047,6 +2047,11 @@
         self.assertIs(type(d), MyDecimal)
         self.assertEqual(d, d1)
 
+        a = Decimal('1.0')
+        b = MyDecimal(a)
+        self.assertIs(type(b), MyDecimal)
+        self.assertEqual(a, b)
+
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
         getcontext = self.decimal.getcontext
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,9 @@
 Library
 -------
 
+- Issue #16431: Use the type information when constructing a Decimal subtype
+  from a Decimal argument.
+
 - Issue #16350: zlib.Decompress.decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
   to the last call. Patch by Serhiy Storchaka.
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2338,6 +2338,32 @@
     return dec;
 }
 
+/* Return a new PyDecObject (subtype) from a Decimal. */
+static PyObject *
+PyDecType_FromDecimalExact(PyTypeObject *type, PyObject *v, PyObject *context)
+{
+    PyObject *dec;
+    uint32_t status = 0;
+
+    if (type == &PyDec_Type) {
+        Py_INCREF(v);
+        return v;
+    }
+
+    dec = PyDecType_New(type);
+    if (dec == NULL) {
+        return NULL;
+    }
+
+    mpd_qcopy(MPD(dec), MPD(v), &status);
+    if (dec_addstatus(context, status)) {
+        Py_DECREF(dec);
+        return NULL;
+    }
+
+    return dec;
+}
+
 static PyObject *
 sequence_as_tuple(PyObject *v, PyObject *ex, const char *mesg)
 {
@@ -2642,8 +2668,7 @@
         return PyDecType_FromSsizeExact(type, 0, context);
     }
     else if (PyDec_Check(v)) {
-        Py_INCREF(v);
-        return v;
+        return PyDecType_FromDecimalExact(type, v, context);
     }
     else if (PyUnicode_Check(v)) {
         return PyDecType_FromUnicodeExactWS(type, v, context);

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

From python-checkins at python.org  Wed Nov  7 23:21:19 2012
From: python-checkins at python.org (stefan.krah)
Date: Wed,  7 Nov 2012 23:21:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3Xxht70yyyzPbX@mail.python.org>

http://hg.python.org/cpython/rev/57649a9a683c
changeset:   80294:57649a9a683c
parent:      80291:859ef54bdce2
parent:      80293:1b6c972457e6
user:        Stefan Krah <skrah at bytereef.org>
date:        Wed Nov 07 23:20:10 2012 +0100
summary:
  Merge 3.3.

files:
  Lib/test/test_decimal.py    |   5 ++++
  Misc/NEWS                   |   3 ++
  Modules/_decimal/_decimal.c |  29 +++++++++++++++++++++++-
  3 files changed, 35 insertions(+), 2 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
@@ -2047,6 +2047,11 @@
         self.assertIs(type(d), MyDecimal)
         self.assertEqual(d, d1)
 
+        a = Decimal('1.0')
+        b = MyDecimal(a)
+        self.assertIs(type(b), MyDecimal)
+        self.assertEqual(a, b)
+
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
         getcontext = self.decimal.getcontext
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -110,6 +110,9 @@
 Library
 -------
 
+- Issue #16431: Use the type information when constructing a Decimal subtype
+  from a Decimal argument.
+
 - Issue #15641: Clean up deprecated classes from importlib
   Patch by Taras Lyapun.
 
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2338,6 +2338,32 @@
     return dec;
 }
 
+/* Return a new PyDecObject (subtype) from a Decimal. */
+static PyObject *
+PyDecType_FromDecimalExact(PyTypeObject *type, PyObject *v, PyObject *context)
+{
+    PyObject *dec;
+    uint32_t status = 0;
+
+    if (type == &PyDec_Type) {
+        Py_INCREF(v);
+        return v;
+    }
+
+    dec = PyDecType_New(type);
+    if (dec == NULL) {
+        return NULL;
+    }
+
+    mpd_qcopy(MPD(dec), MPD(v), &status);
+    if (dec_addstatus(context, status)) {
+        Py_DECREF(dec);
+        return NULL;
+    }
+
+    return dec;
+}
+
 static PyObject *
 sequence_as_tuple(PyObject *v, PyObject *ex, const char *mesg)
 {
@@ -2642,8 +2668,7 @@
         return PyDecType_FromSsizeExact(type, 0, context);
     }
     else if (PyDec_Check(v)) {
-        Py_INCREF(v);
-        return v;
+        return PyDecType_FromDecimalExact(type, v, context);
     }
     else if (PyUnicode_Check(v)) {
         return PyDecType_FromUnicodeExactWS(type, v, context);

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

From python-checkins at python.org  Wed Nov  7 23:55:16 2012
From: python-checkins at python.org (stefan.krah)
Date: Wed,  7 Nov 2012 23:55:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NDMx?=
 =?utf-8?q?=3A_Also_fix_the_opposite_direction=2E?=
Message-ID: <3XxjdJ6bBlzN6v@mail.python.org>

http://hg.python.org/cpython/rev/7fcc58811e82
changeset:   80295:7fcc58811e82
branch:      3.3
parent:      80293:1b6c972457e6
user:        Stefan Krah <skrah at bytereef.org>
date:        Wed Nov 07 23:47:19 2012 +0100
summary:
  Issue #16431: Also fix the opposite direction.

files:
  Lib/test/test_decimal.py    |  4 ++++
  Modules/_decimal/_decimal.c |  2 +-
  2 files changed, 5 insertions(+), 1 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
@@ -2052,6 +2052,10 @@
         self.assertIs(type(b), MyDecimal)
         self.assertEqual(a, b)
 
+        c = Decimal(b)
+        self.assertIs(type(c), Decimal)
+        self.assertEqual(a, c)
+
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
         getcontext = self.decimal.getcontext
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2345,7 +2345,7 @@
     PyObject *dec;
     uint32_t status = 0;
 
-    if (type == &PyDec_Type) {
+    if (type == Py_TYPE(v)) {
         Py_INCREF(v);
         return v;
     }

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

From python-checkins at python.org  Wed Nov  7 23:55:18 2012
From: python-checkins at python.org (stefan.krah)
Date: Wed,  7 Nov 2012 23:55:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XxjdL1vZrzPCN@mail.python.org>

http://hg.python.org/cpython/rev/5fd9b87e08b3
changeset:   80296:5fd9b87e08b3
parent:      80294:57649a9a683c
parent:      80295:7fcc58811e82
user:        Stefan Krah <skrah at bytereef.org>
date:        Wed Nov 07 23:54:37 2012 +0100
summary:
  Merge 3.3.

files:
  Lib/test/test_decimal.py    |  4 ++++
  Modules/_decimal/_decimal.c |  2 +-
  2 files changed, 5 insertions(+), 1 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
@@ -2052,6 +2052,10 @@
         self.assertIs(type(b), MyDecimal)
         self.assertEqual(a, b)
 
+        c = Decimal(b)
+        self.assertIs(type(c), Decimal)
+        self.assertEqual(a, c)
+
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
         getcontext = self.decimal.getcontext
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2345,7 +2345,7 @@
     PyObject *dec;
     uint32_t status = 0;
 
-    if (type == &PyDec_Type) {
+    if (type == Py_TYPE(v)) {
         Py_INCREF(v);
         return v;
     }

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

From solipsis at pitrou.net  Thu Nov  8 05:55:51 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 08 Nov 2012 05:55:51 +0100
Subject: [Python-checkins] Daily reference leaks (5fd9b87e08b3): sum=0
Message-ID: <E1TWK9f-0007Bh-Qu@ap.vmr.nerim.net>

results for 5fd9b87e08b3 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Thu Nov  8 09:12:16 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 09:12:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzEwMzg1OiB1c2Ug?=
 =?utf-8?q?the_mod_role_in_subprocess_docs=2E?=
Message-ID: <3Xxy003Y7szMQl@mail.python.org>

http://hg.python.org/cpython/rev/58564aeec8e4
changeset:   80297:58564aeec8e4
branch:      2.7
parent:      80292:4ebe1ede981e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 10:07:10 2012 +0200
summary:
  #10385: use the mod role in subprocess docs.

files:
  Doc/library/subprocess.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -28,8 +28,8 @@
    :pep:`324` -- PEP proposing the subprocess module
 
 
-Using the subprocess Module
----------------------------
+Using the :mod:`subprocess` Module
+----------------------------------
 
 The recommended approach to invoking subprocesses is to use the following
 convenience functions for all use cases they can handle. For more advanced
@@ -680,8 +680,8 @@
 
 .. _subprocess-replacements:
 
-Replacing Older Functions with the subprocess Module
-----------------------------------------------------
+Replacing Older Functions with the :mod:`subprocess` Module
+-----------------------------------------------------------
 
 In this section, "a becomes b" means that b can be used as a replacement for a.
 
@@ -697,7 +697,7 @@
    the raised exception.
 
 In the following examples, we assume that the relevant functions have already
-been imported from the subprocess module.
+been imported from the :mod:`subprocess` module.
 
 
 Replacing /bin/sh shell backquote

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

From python-checkins at python.org  Thu Nov  8 09:12:17 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 09:12:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzEwMzg1OiB1c2Ug?=
 =?utf-8?q?the_mod_role_in_subprocess_docs=2E?=
Message-ID: <3Xxy0160CLzMR5@mail.python.org>

http://hg.python.org/cpython/rev/8e8d391eb3eb
changeset:   80298:8e8d391eb3eb
branch:      3.2
parent:      80249:56bc323288d1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 10:07:10 2012 +0200
summary:
  #10385: use the mod role in subprocess docs.

files:
  Doc/library/subprocess.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -22,8 +22,8 @@
    :pep:`324` -- PEP proposing the subprocess module
 
 
-Using the subprocess Module
----------------------------
+Using the :mod:`subprocess` Module
+----------------------------------
 
 The recommended approach to invoking subprocesses is to use the following
 convenience functions for all use cases they can handle. For more advanced
@@ -731,8 +731,8 @@
 
 .. _subprocess-replacements:
 
-Replacing Older Functions with the subprocess Module
-----------------------------------------------------
+Replacing Older Functions with the :mod:`subprocess` Module
+-----------------------------------------------------------
 
 In this section, "a becomes b" means that b can be used as a replacement for a.
 
@@ -748,7 +748,7 @@
    the raised exception.
 
 In the following examples, we assume that the relevant functions have already
-been imported from the subprocess module.
+been imported from the :mod:`subprocess` module.
 
 
 Replacing /bin/sh shell backquote

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

From python-checkins at python.org  Thu Nov  8 09:12:19 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 09:12:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2310385=3A_merge_with_3=2E2=2E?=
Message-ID: <3Xxy0317VJzMkr@mail.python.org>

http://hg.python.org/cpython/rev/f45d1afb952b
changeset:   80299:f45d1afb952b
branch:      3.3
parent:      80295:7fcc58811e82
parent:      80298:8e8d391eb3eb
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 10:09:06 2012 +0200
summary:
  #10385: merge with 3.2.

files:
  Doc/library/subprocess.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -22,8 +22,8 @@
    :pep:`324` -- PEP proposing the subprocess module
 
 
-Using the subprocess Module
----------------------------
+Using the :mod:`subprocess` Module
+----------------------------------
 
 The recommended approach to invoking subprocesses is to use the following
 convenience functions for all use cases they can handle. For more advanced
@@ -839,8 +839,8 @@
 
 .. _subprocess-replacements:
 
-Replacing Older Functions with the subprocess Module
-----------------------------------------------------
+Replacing Older Functions with the :mod:`subprocess` Module
+-----------------------------------------------------------
 
 In this section, "a becomes b" means that b can be used as a replacement for a.
 
@@ -856,7 +856,7 @@
    the raised exception.
 
 In the following examples, we assume that the relevant functions have already
-been imported from the subprocess module.
+been imported from the :mod:`subprocess` module.
 
 
 Replacing /bin/sh shell backquote

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

From python-checkins at python.org  Thu Nov  8 09:12:20 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 09:12:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzEwMzg1OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Xxy043SG1zN6k@mail.python.org>

http://hg.python.org/cpython/rev/5d7e7e7e2e82
changeset:   80300:5d7e7e7e2e82
parent:      80296:5fd9b87e08b3
parent:      80299:f45d1afb952b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 10:09:24 2012 +0200
summary:
  #10385: merge with 3.3.

files:
  Doc/library/subprocess.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -22,8 +22,8 @@
    :pep:`324` -- PEP proposing the subprocess module
 
 
-Using the subprocess Module
----------------------------
+Using the :mod:`subprocess` Module
+----------------------------------
 
 The recommended approach to invoking subprocesses is to use the following
 convenience functions for all use cases they can handle. For more advanced
@@ -839,8 +839,8 @@
 
 .. _subprocess-replacements:
 
-Replacing Older Functions with the subprocess Module
-----------------------------------------------------
+Replacing Older Functions with the :mod:`subprocess` Module
+-----------------------------------------------------------
 
 In this section, "a becomes b" means that b can be used as a replacement for a.
 
@@ -856,7 +856,7 @@
    the raised exception.
 
 In the following examples, we assume that the relevant functions have already
-been imported from the subprocess module.
+been imported from the :mod:`subprocess` module.
 
 
 Replacing /bin/sh shell backquote

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

From python-checkins at python.org  Thu Nov  8 09:12:21 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 09:12:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?=
	=?utf-8?q?_Merge_heads=2E?=
Message-ID: <3Xxy055ZzgzNQ6@mail.python.org>

http://hg.python.org/cpython/rev/ea04a7d2407d
changeset:   80301:ea04a7d2407d
branch:      3.2
parent:      80289:b256d054f229
parent:      80298:8e8d391eb3eb
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 10:11:22 2012 +0200
summary:
  Merge heads.

files:
  Doc/library/subprocess.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -22,8 +22,8 @@
    :pep:`324` -- PEP proposing the subprocess module
 
 
-Using the subprocess Module
----------------------------
+Using the :mod:`subprocess` Module
+----------------------------------
 
 The recommended approach to invoking subprocesses is to use the following
 convenience functions for all use cases they can handle. For more advanced
@@ -731,8 +731,8 @@
 
 .. _subprocess-replacements:
 
-Replacing Older Functions with the subprocess Module
-----------------------------------------------------
+Replacing Older Functions with the :mod:`subprocess` Module
+-----------------------------------------------------------
 
 In this section, "a becomes b" means that b can be used as a replacement for a.
 
@@ -748,7 +748,7 @@
    the raised exception.
 
 In the following examples, we assume that the relevant functions have already
-been imported from the subprocess module.
+been imported from the :mod:`subprocess` module.
 
 
 Replacing /bin/sh shell backquote

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

From python-checkins at python.org  Thu Nov  8 10:06:31 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:06:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzExNDgxOiB1cGRh?=
 =?utf-8?q?te_copy=5Freg_docs_and_add_example=2E?=
Message-ID: <3XxzBb2stTzMG3@mail.python.org>

http://hg.python.org/cpython/rev/2bd6150b48ea
changeset:   80302:2bd6150b48ea
branch:      2.7
parent:      80297:58564aeec8e4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 10:59:03 2012 +0200
summary:
  #11481: update copy_reg docs and add example.

files:
  Doc/library/copy_reg.rst |  31 +++++++++++++++++++++++----
  1 files changed, 26 insertions(+), 5 deletions(-)


diff --git a/Doc/library/copy_reg.rst b/Doc/library/copy_reg.rst
--- a/Doc/library/copy_reg.rst
+++ b/Doc/library/copy_reg.rst
@@ -14,11 +14,11 @@
    module: cPickle
    module: copy
 
-The :mod:`copy_reg` module provides support for the :mod:`pickle` and
-:mod:`cPickle` modules.  The :mod:`copy` module is likely to use this in the
-future as well.  It provides configuration information about object constructors
-which are not classes.  Such constructors may be factory functions or class
-instances.
+The :mod:`copy_reg` module offers a way to define fuctions used while pickling
+specific objects.  The :mod:`pickle`, :mod:`cPickle, and :mod:`copy` modules
+use those functions when pickling/copying those objects.  The module provides
+configuration information about object constructors which are not classes.
+Such constructors may be factory functions or class instances.
 
 
 .. function:: constructor(object)
@@ -43,3 +43,24 @@
    See the :mod:`pickle` module for more details on the interface expected of
    *function* and *constructor*.
 
+Example
+-------
+
+The example below would like to show how to register a pickle function and how
+it will be used:
+
+   >>> import copy_reg, copy, pickle
+   >>> class C(object):
+   ...     def __init__(self, a):
+   ...         self.a = a
+   ...
+   >>> def pickle_c(c):
+   ...     print("pickling a C instance...")
+   ...     return C, (c.a,)
+   ...
+   >>> copy_reg.pickle(C, pickle_c)
+   >>> c = C(1)
+   >>> d = copy.copy(c)
+   pickling a C instance...
+   >>> p = pickle.dumps(c)
+   pickling a C instance...

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

From python-checkins at python.org  Thu Nov  8 10:06:32 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:06:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzExNDgxOiBmaXgg?=
	=?utf-8?q?markup=2E?=
Message-ID: <3XxzBc5Q0VzN6c@mail.python.org>

http://hg.python.org/cpython/rev/e089bdca9d9c
changeset:   80303:e089bdca9d9c
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:02:58 2012 +0200
summary:
  #11481: fix markup.

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


diff --git a/Doc/library/copy_reg.rst b/Doc/library/copy_reg.rst
--- a/Doc/library/copy_reg.rst
+++ b/Doc/library/copy_reg.rst
@@ -15,7 +15,7 @@
    module: copy
 
 The :mod:`copy_reg` module offers a way to define fuctions used while pickling
-specific objects.  The :mod:`pickle`, :mod:`cPickle, and :mod:`copy` modules
+specific objects.  The :mod:`pickle`, :mod:`cPickle`, and :mod:`copy` modules
 use those functions when pickling/copying those objects.  The module provides
 configuration information about object constructors which are not classes.
 Such constructors may be factory functions or class instances.

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

From python-checkins at python.org  Thu Nov  8 10:06:34 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:06:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzExNDgxOiB1cGRh?=
 =?utf-8?q?te_copyreg_docs_and_add_example=2E?=
Message-ID: <3XxzBf0bFrzMrs@mail.python.org>

http://hg.python.org/cpython/rev/12dbb3187105
changeset:   80304:12dbb3187105
branch:      3.2
parent:      80301:ea04a7d2407d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:04:57 2012 +0200
summary:
  #11481: update copyreg docs and add example.

files:
  Doc/library/copy.rst    |   4 ++--
  Doc/library/copyreg.rst |  29 ++++++++++++++++++++++++++---
  2 files changed, 28 insertions(+), 5 deletions(-)


diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -67,8 +67,8 @@
 
 Classes can use the same interfaces to control copying that they use to control
 pickling.  See the description of module :mod:`pickle` for information on these
-methods.  The :mod:`copy` module does not use the :mod:`copyreg` registration
-module.
+methods.  In fact, :mod:`copy` module uses the registered pickle functions from
+:mod:`copyreg` module.
 
 .. index::
    single: __copy__() (copy protocol)
diff --git a/Doc/library/copyreg.rst b/Doc/library/copyreg.rst
--- a/Doc/library/copyreg.rst
+++ b/Doc/library/copyreg.rst
@@ -9,9 +9,10 @@
    module: pickle
    module: copy
 
-The :mod:`copyreg` module provides support for the :mod:`pickle` module.  The
-:mod:`copy` module is likely to use this in the future as well.  It provides
-configuration information about object constructors which are not classes.
+The :mod:`copyreg` module offers a way to define fuctions used while pickling
+specific objects.  The :mod:`pickle` and :mod:`copy` modules use those functions
+when pickling/copying those objects.  The module provides configuration
+information about object constructors which are not classes.
 Such constructors may be factory functions or class instances.
 
 
@@ -35,3 +36,25 @@
    See the :mod:`pickle` module for more details on the interface expected of
    *function* and *constructor*.
 
+
+Example
+-------
+
+The example below would like to show how to register a pickle function and how
+it will be used:
+
+   >>> import copyreg, copy, pickle
+   >>> class C(object):
+   ...     def __init__(self, a):
+   ...         self.a = a
+   ...
+   >>> def pickle_c(c):
+   ...     print("pickling a C instance...")
+   ...     return C, (c.a,)
+   ...
+   >>> copyreg.pickle(C, pickle_c)
+   >>> c = C(1)
+   >>> d = copy.copy(c)
+   pickling a C instance...
+   >>> p = pickle.dumps(c)
+   pickling a C instance...

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

From python-checkins at python.org  Thu Nov  8 10:06:35 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:06:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2311481=3A_merge_with_3=2E2=2E?=
Message-ID: <3XxzBg2v1QzNQ6@mail.python.org>

http://hg.python.org/cpython/rev/87ec3ce3a04e
changeset:   80305:87ec3ce3a04e
branch:      3.3
parent:      80299:f45d1afb952b
parent:      80304:12dbb3187105
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:06:01 2012 +0200
summary:
  #11481: merge with 3.2.

files:
  Doc/library/copy.rst    |   4 ++--
  Doc/library/copyreg.rst |  29 ++++++++++++++++++++++++++---
  2 files changed, 28 insertions(+), 5 deletions(-)


diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -67,8 +67,8 @@
 
 Classes can use the same interfaces to control copying that they use to control
 pickling.  See the description of module :mod:`pickle` for information on these
-methods.  The :mod:`copy` module does not use the :mod:`copyreg` registration
-module.
+methods.  In fact, :mod:`copy` module uses the registered pickle functions from
+:mod:`copyreg` module.
 
 .. index::
    single: __copy__() (copy protocol)
diff --git a/Doc/library/copyreg.rst b/Doc/library/copyreg.rst
--- a/Doc/library/copyreg.rst
+++ b/Doc/library/copyreg.rst
@@ -9,9 +9,10 @@
    module: pickle
    module: copy
 
-The :mod:`copyreg` module provides support for the :mod:`pickle` module.  The
-:mod:`copy` module is likely to use this in the future as well.  It provides
-configuration information about object constructors which are not classes.
+The :mod:`copyreg` module offers a way to define fuctions used while pickling
+specific objects.  The :mod:`pickle` and :mod:`copy` modules use those functions
+when pickling/copying those objects.  The module provides configuration
+information about object constructors which are not classes.
 Such constructors may be factory functions or class instances.
 
 
@@ -37,3 +38,25 @@
    :attr:`~pickle.Pickler.dispatch_table` attribute of a pickler
    object or subclass of :class:`pickle.Pickler` can also be used for
    declaring reduction functions.
+
+Example
+-------
+
+The example below would like to show how to register a pickle function and how
+it will be used:
+
+   >>> import copyreg, copy, pickle
+   >>> class C(object):
+   ...     def __init__(self, a):
+   ...         self.a = a
+   ...
+   >>> def pickle_c(c):
+   ...     print("pickling a C instance...")
+   ...     return C, (c.a,)
+   ...
+   >>> copyreg.pickle(C, pickle_c)
+   >>> c = C(1)
+   >>> d = copy.copy(c)
+   pickling a C instance...
+   >>> p = pickle.dumps(c)
+   pickling a C instance...

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

From python-checkins at python.org  Thu Nov  8 10:06:36 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:06:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzExNDgxOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XxzBh59l9zMGP@mail.python.org>

http://hg.python.org/cpython/rev/20b65b88e0a0
changeset:   80306:20b65b88e0a0
parent:      80300:5d7e7e7e2e82
parent:      80305:87ec3ce3a04e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:06:19 2012 +0200
summary:
  #11481: merge with 3.3.

files:
  Doc/library/copy.rst    |   4 ++--
  Doc/library/copyreg.rst |  29 ++++++++++++++++++++++++++---
  2 files changed, 28 insertions(+), 5 deletions(-)


diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -67,8 +67,8 @@
 
 Classes can use the same interfaces to control copying that they use to control
 pickling.  See the description of module :mod:`pickle` for information on these
-methods.  The :mod:`copy` module does not use the :mod:`copyreg` registration
-module.
+methods.  In fact, :mod:`copy` module uses the registered pickle functions from
+:mod:`copyreg` module.
 
 .. index::
    single: __copy__() (copy protocol)
diff --git a/Doc/library/copyreg.rst b/Doc/library/copyreg.rst
--- a/Doc/library/copyreg.rst
+++ b/Doc/library/copyreg.rst
@@ -9,9 +9,10 @@
    module: pickle
    module: copy
 
-The :mod:`copyreg` module provides support for the :mod:`pickle` module.  The
-:mod:`copy` module is likely to use this in the future as well.  It provides
-configuration information about object constructors which are not classes.
+The :mod:`copyreg` module offers a way to define fuctions used while pickling
+specific objects.  The :mod:`pickle` and :mod:`copy` modules use those functions
+when pickling/copying those objects.  The module provides configuration
+information about object constructors which are not classes.
 Such constructors may be factory functions or class instances.
 
 
@@ -37,3 +38,25 @@
    :attr:`~pickle.Pickler.dispatch_table` attribute of a pickler
    object or subclass of :class:`pickle.Pickler` can also be used for
    declaring reduction functions.
+
+Example
+-------
+
+The example below would like to show how to register a pickle function and how
+it will be used:
+
+   >>> import copyreg, copy, pickle
+   >>> class C(object):
+   ...     def __init__(self, a):
+   ...         self.a = a
+   ...
+   >>> def pickle_c(c):
+   ...     print("pickling a C instance...")
+   ...     return C, (c.a,)
+   ...
+   >>> copyreg.pickle(C, pickle_c)
+   >>> c = C(1)
+   >>> d = copy.copy(c)
+   pickling a C instance...
+   >>> p = pickle.dumps(c)
+   pickling a C instance...

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

From python-checkins at python.org  Thu Nov  8 10:09:42 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:09:42 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NDMzOiBmaXgg?=
 =?utf-8?q?docstring_of_assertNotEqual=2E?=
Message-ID: <3XxzGG2qSKzM1V@mail.python.org>

http://hg.python.org/cpython/rev/d32d04edd371
changeset:   80307:d32d04edd371
branch:      2.7
parent:      80303:e089bdca9d9c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:08:39 2012 +0200
summary:
  #16433: fix docstring of assertNotEqual.

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


diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -516,7 +516,7 @@
         assertion_func(first, second, msg=msg)
 
     def assertNotEqual(self, first, second, msg=None):
-        """Fail if the two objects are equal as determined by the '=='
+        """Fail if the two objects are equal as determined by the '!='
            operator.
         """
         if not first != second:

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

From python-checkins at python.org  Thu Nov  8 10:09:43 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:09:43 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NDMzOiBmaXgg?=
 =?utf-8?q?docstring_of_assertNotEqual=2E?=
Message-ID: <3XxzGH5Qh3zMPk@mail.python.org>

http://hg.python.org/cpython/rev/9d5cc978cfe5
changeset:   80308:9d5cc978cfe5
branch:      3.2
parent:      80304:12dbb3187105
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:08:39 2012 +0200
summary:
  #16433: fix docstring of assertNotEqual.

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


diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -628,7 +628,7 @@
         assertion_func(first, second, msg=msg)
 
     def assertNotEqual(self, first, second, msg=None):
-        """Fail if the two objects are equal as determined by the '=='
+        """Fail if the two objects are equal as determined by the '!='
            operator.
         """
         if not first != second:

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

From python-checkins at python.org  Thu Nov  8 10:09:45 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:09:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316433=3A_merge_with_3=2E2=2E?=
Message-ID: <3XxzGK0zkhzN6c@mail.python.org>

http://hg.python.org/cpython/rev/e0fe5eead38a
changeset:   80309:e0fe5eead38a
branch:      3.3
parent:      80305:87ec3ce3a04e
parent:      80308:9d5cc978cfe5
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:09:13 2012 +0200
summary:
  #16433: merge with 3.2.

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


diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -642,7 +642,7 @@
         assertion_func(first, second, msg=msg)
 
     def assertNotEqual(self, first, second, msg=None):
-        """Fail if the two objects are equal as determined by the '=='
+        """Fail if the two objects are equal as determined by the '!='
            operator.
         """
         if not first != second:

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

From python-checkins at python.org  Thu Nov  8 10:09:46 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu,  8 Nov 2012 10:09:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NDMzOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XxzGL4FlDzPbX@mail.python.org>

http://hg.python.org/cpython/rev/6eba4df6bb21
changeset:   80310:6eba4df6bb21
parent:      80306:20b65b88e0a0
parent:      80309:e0fe5eead38a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 08 11:09:28 2012 +0200
summary:
  #16433: merge with 3.3.

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


diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -642,7 +642,7 @@
         assertion_func(first, second, msg=msg)
 
     def assertNotEqual(self, first, second, msg=None):
-        """Fail if the two objects are equal as determined by the '=='
+        """Fail if the two objects are equal as determined by the '!='
            operator.
         """
         if not first != second:

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

From python-checkins at python.org  Thu Nov  8 11:20:41 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu,  8 Nov 2012 11:20:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NDMx?=
 =?utf-8?q?=3A_Finally=2C_consider_all_permutations=2E?=
Message-ID: <3Xy0r95xpCzMWT@mail.python.org>

http://hg.python.org/cpython/rev/9a701e8ec2c9
changeset:   80311:9a701e8ec2c9
branch:      3.3
parent:      80309:e0fe5eead38a
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 08 11:17:29 2012 +0100
summary:
  Issue #16431: Finally, consider all permutations.

files:
  Lib/test/test_decimal.py    |  33 ++++++++++++++++++------
  Modules/_decimal/_decimal.c |   4 +-
  2 files changed, 26 insertions(+), 11 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
@@ -2029,7 +2029,7 @@
         Decimal = self.decimal.Decimal
 
         class MyDecimal(Decimal):
-            pass
+            y = None
 
         d1 = MyDecimal(1)
         d2 = MyDecimal(2)
@@ -2047,14 +2047,29 @@
         self.assertIs(type(d), MyDecimal)
         self.assertEqual(d, d1)
 
-        a = Decimal('1.0')
-        b = MyDecimal(a)
-        self.assertIs(type(b), MyDecimal)
-        self.assertEqual(a, b)
-
-        c = Decimal(b)
-        self.assertIs(type(c), Decimal)
-        self.assertEqual(a, c)
+        # Decimal(Decimal)
+        d = Decimal('1.0')
+        x = Decimal(d)
+        self.assertIs(type(x), Decimal)
+        self.assertEqual(x, d)
+
+        # MyDecimal(Decimal)
+        m = MyDecimal(d)
+        self.assertIs(type(m), MyDecimal)
+        self.assertEqual(m, d)
+        self.assertIs(m.y, None)
+
+        # Decimal(MyDecimal)
+        x = Decimal(m)
+        self.assertIs(type(x), Decimal)
+        self.assertEqual(x, d)
+
+        # MyDecimal(MyDecimal)
+        m.y = 9
+        x = MyDecimal(m)
+        self.assertIs(type(x), MyDecimal)
+        self.assertEqual(x, d)
+        self.assertIs(x.y, None)
 
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2338,14 +2338,14 @@
     return dec;
 }
 
-/* Return a new PyDecObject (subtype) from a Decimal. */
+/* Return a new PyDecObject or a subtype from a Decimal. */
 static PyObject *
 PyDecType_FromDecimalExact(PyTypeObject *type, PyObject *v, PyObject *context)
 {
     PyObject *dec;
     uint32_t status = 0;
 
-    if (type == Py_TYPE(v)) {
+    if (type == &PyDec_Type && PyDec_CheckExact(v)) {
         Py_INCREF(v);
         return v;
     }

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

From python-checkins at python.org  Thu Nov  8 11:20:43 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu,  8 Nov 2012 11:20:43 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3Xy0rC1Z04zN6c@mail.python.org>

http://hg.python.org/cpython/rev/b59f021a71c7
changeset:   80312:b59f021a71c7
parent:      80310:6eba4df6bb21
parent:      80311:9a701e8ec2c9
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 08 11:19:55 2012 +0100
summary:
  Merge 3.3.

files:
  Lib/test/test_decimal.py    |  33 ++++++++++++++++++------
  Modules/_decimal/_decimal.c |   4 +-
  2 files changed, 26 insertions(+), 11 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
@@ -2029,7 +2029,7 @@
         Decimal = self.decimal.Decimal
 
         class MyDecimal(Decimal):
-            pass
+            y = None
 
         d1 = MyDecimal(1)
         d2 = MyDecimal(2)
@@ -2047,14 +2047,29 @@
         self.assertIs(type(d), MyDecimal)
         self.assertEqual(d, d1)
 
-        a = Decimal('1.0')
-        b = MyDecimal(a)
-        self.assertIs(type(b), MyDecimal)
-        self.assertEqual(a, b)
-
-        c = Decimal(b)
-        self.assertIs(type(c), Decimal)
-        self.assertEqual(a, c)
+        # Decimal(Decimal)
+        d = Decimal('1.0')
+        x = Decimal(d)
+        self.assertIs(type(x), Decimal)
+        self.assertEqual(x, d)
+
+        # MyDecimal(Decimal)
+        m = MyDecimal(d)
+        self.assertIs(type(m), MyDecimal)
+        self.assertEqual(m, d)
+        self.assertIs(m.y, None)
+
+        # Decimal(MyDecimal)
+        x = Decimal(m)
+        self.assertIs(type(x), Decimal)
+        self.assertEqual(x, d)
+
+        # MyDecimal(MyDecimal)
+        m.y = 9
+        x = MyDecimal(m)
+        self.assertIs(type(x), MyDecimal)
+        self.assertEqual(x, d)
+        self.assertIs(x.y, None)
 
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2338,14 +2338,14 @@
     return dec;
 }
 
-/* Return a new PyDecObject (subtype) from a Decimal. */
+/* Return a new PyDecObject or a subtype from a Decimal. */
 static PyObject *
 PyDecType_FromDecimalExact(PyTypeObject *type, PyObject *v, PyObject *context)
 {
     PyObject *dec;
     uint32_t status = 0;
 
-    if (type == Py_TYPE(v)) {
+    if (type == &PyDec_Type && PyDec_CheckExact(v)) {
         Py_INCREF(v);
         return v;
     }

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

From python-checkins at python.org  Thu Nov  8 15:11:57 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 15:11:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDM1?=
 =?utf-8?q?=3A_Link_in_tutorial_now_points_to_python3_FAQ=2E?=
Message-ID: <3Xy5z15R6wzMPk@mail.python.org>

http://hg.python.org/cpython/rev/64527cb2e13a
changeset:   80313:64527cb2e13a
branch:      3.2
parent:      80308:9d5cc978cfe5
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 16:10:49 2012 +0200
summary:
  Issue #16435: Link in tutorial now points to python3 FAQ.

Thanks to Yongzhi Pan from docs@

files:
  Doc/tutorial/whatnow.rst |  12 +++++-------
  1 files changed, 5 insertions(+), 7 deletions(-)


diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -60,14 +60,12 @@
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
 Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/doc/faq/>`_ (also called the FAQ), or look for it in the
-:file:`Misc/` directory of the Python source distribution.  Mailing list
-archives are available at http://mail.python.org/pipermail/. The FAQ answers
-many of the questions that come up again and again, and may already contain the
-solution for your problem.
+<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
+or look for it in the :file:`Misc/` directory of the Python source distribution.
+Mailing list archives are available at http://mail.python.org/pipermail/.
+The FAQ answers many of the questions that come up again and again,
+and may already contain the solution for your problem.
 
 .. Postings figure based on average of last six months activity as
    reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
    days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)
-
-

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

From python-checkins at python.org  Thu Nov  8 15:11:59 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 15:11:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=2316435=3A_Link_in_tutorial_now_points_to_python3?=
 =?utf-8?q?_FAQ=2E?=
Message-ID: <3Xy5z30lGxzMWT@mail.python.org>

http://hg.python.org/cpython/rev/1d5ca20f73e2
changeset:   80314:1d5ca20f73e2
branch:      3.3
parent:      80311:9a701e8ec2c9
parent:      80313:64527cb2e13a
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 16:11:22 2012 +0200
summary:
  Merge issue #16435: Link in tutorial now points to python3 FAQ.

Thanks to Yongzhi Pan from docs@

files:
  Doc/tutorial/whatnow.rst |  12 +++++-------
  1 files changed, 5 insertions(+), 7 deletions(-)


diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -60,14 +60,12 @@
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
 Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/doc/faq/>`_ (also called the FAQ), or look for it in the
-:file:`Misc/` directory of the Python source distribution.  Mailing list
-archives are available at http://mail.python.org/pipermail/. The FAQ answers
-many of the questions that come up again and again, and may already contain the
-solution for your problem.
+<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
+or look for it in the :file:`Misc/` directory of the Python source distribution.
+Mailing list archives are available at http://mail.python.org/pipermail/.
+The FAQ answers many of the questions that come up again and again,
+and may already contain the solution for your problem.
 
 .. Postings figure based on average of last six months activity as
    reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
    days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)
-
-

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

From python-checkins at python.org  Thu Nov  8 15:12:00 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 15:12:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316435=3A_Link_in_tutorial_now_points_to_p?=
 =?utf-8?q?ython3_FAQ=2E?=
Message-ID: <3Xy5z431RFzP3k@mail.python.org>

http://hg.python.org/cpython/rev/e1e019b3d903
changeset:   80315:e1e019b3d903
parent:      80312:b59f021a71c7
parent:      80314:1d5ca20f73e2
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 16:11:44 2012 +0200
summary:
  Merge issue #16435: Link in tutorial now points to python3 FAQ.

Thanks to Yongzhi Pan from docs@

files:
  Doc/tutorial/whatnow.rst |  12 +++++-------
  1 files changed, 5 insertions(+), 7 deletions(-)


diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -60,14 +60,12 @@
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
 Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/doc/faq/>`_ (also called the FAQ), or look for it in the
-:file:`Misc/` directory of the Python source distribution.  Mailing list
-archives are available at http://mail.python.org/pipermail/. The FAQ answers
-many of the questions that come up again and again, and may already contain the
-solution for your problem.
+<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
+or look for it in the :file:`Misc/` directory of the Python source distribution.
+Mailing list archives are available at http://mail.python.org/pipermail/.
+The FAQ answers many of the questions that come up again and again,
+and may already contain the solution for your problem.
 
 .. Postings figure based on average of last six months activity as
    reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
    days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)
-
-

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

From python-checkins at python.org  Thu Nov  8 16:29:15 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 16:29:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDM5?=
 =?utf-8?q?=3A_Fix_markup_in_example_for_stdtypes=2E?=
Message-ID: <3Xy7hC1SsxzPW1@mail.python.org>

http://hg.python.org/cpython/rev/aeb5c53a1d69
changeset:   80316:aeb5c53a1d69
branch:      3.2
parent:      80313:64527cb2e13a
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 17:26:53 2012 +0200
summary:
  Issue #16439: Fix markup in example for stdtypes.

Thanks to Yongzhi Pan.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1390,11 +1390,11 @@
 
         >>> import re
         >>> def titlecase(s):
-                return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
-                              lambda mo: mo.group(0)[0].upper() +
-                                         mo.group(0)[1:].lower(),
-                              s)
-
+        ...     return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
+        ...                   lambda mo: mo.group(0)[0].upper() +
+        ...                              mo.group(0)[1:].lower(),
+        ...                   s)
+        ...
         >>> titlecase("they're bill's friends.")
         "They're Bill's Friends."
 

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

From python-checkins at python.org  Thu Nov  8 16:29:16 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 16:29:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=2316439=3A_Fix_markup_in_example_for_stdtypes=2E?=
Message-ID: <3Xy7hD4VLjzPpJ@mail.python.org>

http://hg.python.org/cpython/rev/65499860c6f8
changeset:   80317:65499860c6f8
branch:      3.3
parent:      80314:1d5ca20f73e2
parent:      80316:aeb5c53a1d69
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 17:27:39 2012 +0200
summary:
  Merge issue #16439: Fix markup in example for stdtypes.

Thanks to Yongzhi Pan.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1832,11 +1832,11 @@
 
         >>> import re
         >>> def titlecase(s):
-                return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
-                              lambda mo: mo.group(0)[0].upper() +
-                                         mo.group(0)[1:].lower(),
-                              s)
-
+        ...     return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
+        ...                   lambda mo: mo.group(0)[0].upper() +
+        ...                              mo.group(0)[1:].lower(),
+        ...                   s)
+        ...
         >>> titlecase("they're bill's friends.")
         "They're Bill's Friends."
 

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

From python-checkins at python.org  Thu Nov  8 16:29:18 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 16:29:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316439=3A_Fix_markup_in_example_for_stdtyp?=
 =?utf-8?b?ZXMu?=
Message-ID: <3Xy7hG0hqSzPkT@mail.python.org>

http://hg.python.org/cpython/rev/ce6fc4531d26
changeset:   80318:ce6fc4531d26
parent:      80315:e1e019b3d903
parent:      80317:65499860c6f8
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 17:27:53 2012 +0200
summary:
  Merge issue #16439: Fix markup in example for stdtypes.

Thanks to Yongzhi Pan.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1832,11 +1832,11 @@
 
         >>> import re
         >>> def titlecase(s):
-                return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
-                              lambda mo: mo.group(0)[0].upper() +
-                                         mo.group(0)[1:].lower(),
-                              s)
-
+        ...     return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
+        ...                   lambda mo: mo.group(0)[0].upper() +
+        ...                              mo.group(0)[1:].lower(),
+        ...                   s)
+        ...
         >>> titlecase("they're bill's friends.")
         "They're Bill's Friends."
 

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

From python-checkins at python.org  Thu Nov  8 16:29:19 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu,  8 Nov 2012 16:29:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2NDM5?=
 =?utf-8?q?=3A_Fix_markup_in_example_for_stdtypes=2E?=
Message-ID: <3Xy7hH4DBHzPqg@mail.python.org>

http://hg.python.org/cpython/rev/f068c3e7743d
changeset:   80319:f068c3e7743d
branch:      2.7
parent:      80307:d32d04edd371
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 08 17:29:02 2012 +0200
summary:
  Issue #16439: Fix markup in example for stdtypes.

Thanks to Yongzhi Pan.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1253,11 +1253,11 @@
 
         >>> import re
         >>> def titlecase(s):
-                return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
-                              lambda mo: mo.group(0)[0].upper() +
-                                         mo.group(0)[1:].lower(),
-                              s)
-
+        ...     return re.sub(r"[A-Za-z]+('[A-Za-z]+)?",
+        ...                   lambda mo: mo.group(0)[0].upper() +
+        ...                              mo.group(0)[1:].lower(),
+        ...                   s)
+        ...
         >>> titlecase("they're bill's friends.")
         "They're Bill's Friends."
 

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

From python-checkins at python.org  Fri Nov  9 00:09:49 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 00:09:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NDQwOiBmaXgg?=
 =?utf-8?q?exception_type_and_clarify_example=2E?=
Message-ID: <3XyKvd2lrwzQ1s@mail.python.org>

http://hg.python.org/cpython/rev/8b181c75792f
changeset:   80320:8b181c75792f
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 01:03:44 2012 +0200
summary:
  #16440: fix exception type and clarify example.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2878,16 +2878,23 @@
 Like function objects, methods objects support getting arbitrary attributes.
 However, since method attributes are actually stored on the underlying function
 object (``meth.im_func``), setting method attributes on either bound or unbound
-methods is disallowed.  Attempting to set a method attribute results in a
-:exc:`TypeError` being raised.  In order to set a method attribute, you need to
-explicitly set it on the underlying function object::
-
-   class C:
-       def method(self):
-           pass
-
-   c = C()
-   c.method.im_func.whoami = 'my name is c'
+methods is disallowed.  Attempting to set an attribute on a method results in
+an :exc:`AttributeError` being raised.  In order to set a method attribute, you
+need to explicitly set it on the underlying function object::
+
+   >>> class C:
+   ...     def method(self):
+   ...         pass
+   ...
+   >>> c = C()
+   >>> c.method.whoami = 'my name is method'  # can't set on the method
+   Traceback (most recent call last):
+     File "<stdin>", line 1, in <module>
+   AttributeError: 'instancemethod' object has no attribute 'whoami'
+   >>> c.method.im_func.whoami = 'my name is method'
+   >>> c.method.whoami
+   'my name is method'
+
 
 See :ref:`types` for more information.
 

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

From python-checkins at python.org  Fri Nov  9 00:09:50 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 00:09:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NDQwOiBmaXgg?=
 =?utf-8?q?exception_type_and_clarify_example=2E?=
Message-ID: <3XyKvf59YXzQ1s@mail.python.org>

http://hg.python.org/cpython/rev/bb39ca6bcd7a
changeset:   80321:bb39ca6bcd7a
branch:      3.2
parent:      80316:aeb5c53a1d69
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 01:08:25 2012 +0200
summary:
  #16440: fix exception type and clarify example.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2659,16 +2659,22 @@
 Like function objects, bound method objects support getting arbitrary
 attributes.  However, since method attributes are actually stored on the
 underlying function object (``meth.__func__``), setting method attributes on
-bound methods is disallowed.  Attempting to set a method attribute results in a
-:exc:`TypeError` being raised.  In order to set a method attribute, you need to
-explicitly set it on the underlying function object::
-
-   class C:
-       def method(self):
-           pass
-
-   c = C()
-   c.method.__func__.whoami = 'my name is c'
+bound methods is disallowed.  Attempting to set an attribute on a method
+results in an :exc:`AttributeError` being raised.  In order to set a method
+attribute, you need to explicitly set it on the underlying function object::
+
+   >>> class C:
+   ...     def method(self):
+   ...         pass
+   ...
+   >>> c = C()
+   >>> c.method.whoami = 'my name is method'  # can't set on the method
+   Traceback (most recent call last):
+     File "<stdin>", line 1, in <module>
+   AttributeError: 'method' object has no attribute 'whoami'
+   >>> c.method.__func__.whoami = 'my name is method'
+   >>> c.method.whoami
+   'my name is method'
 
 See :ref:`types` for more information.
 

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

From python-checkins at python.org  Fri Nov  9 00:09:52 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 00:09:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316440=3A_merge_with_3=2E2=2E?=
Message-ID: <3XyKvh0XRKzQ3l@mail.python.org>

http://hg.python.org/cpython/rev/8c7f2f6f3375
changeset:   80322:8c7f2f6f3375
branch:      3.3
parent:      80317:65499860c6f8
parent:      80321:bb39ca6bcd7a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 01:09:10 2012 +0200
summary:
  #16440: merge with 3.2.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3343,16 +3343,22 @@
 Like function objects, bound method objects support getting arbitrary
 attributes.  However, since method attributes are actually stored on the
 underlying function object (``meth.__func__``), setting method attributes on
-bound methods is disallowed.  Attempting to set a method attribute results in a
-:exc:`TypeError` being raised.  In order to set a method attribute, you need to
-explicitly set it on the underlying function object::
-
-   class C:
-       def method(self):
-           pass
-
-   c = C()
-   c.method.__func__.whoami = 'my name is c'
+bound methods is disallowed.  Attempting to set an attribute on a method
+results in an :exc:`AttributeError` being raised.  In order to set a method
+attribute, you need to explicitly set it on the underlying function object::
+
+   >>> class C:
+   ...     def method(self):
+   ...         pass
+   ...
+   >>> c = C()
+   >>> c.method.whoami = 'my name is method'  # can't set on the method
+   Traceback (most recent call last):
+     File "<stdin>", line 1, in <module>
+   AttributeError: 'method' object has no attribute 'whoami'
+   >>> c.method.__func__.whoami = 'my name is method'
+   >>> c.method.whoami
+   'my name is method'
 
 See :ref:`types` for more information.
 

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

From python-checkins at python.org  Fri Nov  9 00:09:53 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 00:09:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NDQwOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XyKvj2rJjzQ0g@mail.python.org>

http://hg.python.org/cpython/rev/d170844a363f
changeset:   80323:d170844a363f
parent:      80318:ce6fc4531d26
parent:      80322:8c7f2f6f3375
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 01:09:27 2012 +0200
summary:
  #16440: merge with 3.3.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3343,16 +3343,22 @@
 Like function objects, bound method objects support getting arbitrary
 attributes.  However, since method attributes are actually stored on the
 underlying function object (``meth.__func__``), setting method attributes on
-bound methods is disallowed.  Attempting to set a method attribute results in a
-:exc:`TypeError` being raised.  In order to set a method attribute, you need to
-explicitly set it on the underlying function object::
-
-   class C:
-       def method(self):
-           pass
-
-   c = C()
-   c.method.__func__.whoami = 'my name is c'
+bound methods is disallowed.  Attempting to set an attribute on a method
+results in an :exc:`AttributeError` being raised.  In order to set a method
+attribute, you need to explicitly set it on the underlying function object::
+
+   >>> class C:
+   ...     def method(self):
+   ...         pass
+   ...
+   >>> c = C()
+   >>> c.method.whoami = 'my name is method'  # can't set on the method
+   Traceback (most recent call last):
+     File "<stdin>", line 1, in <module>
+   AttributeError: 'method' object has no attribute 'whoami'
+   >>> c.method.__func__.whoami = 'my name is method'
+   >>> c.method.whoami
+   'my name is method'
 
 See :ref:`types` for more information.
 

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

From python-checkins at python.org  Fri Nov  9 01:08:43 2012
From: python-checkins at python.org (brett.cannon)
Date: Fri,  9 Nov 2012 01:08:43 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Update_mako=5Fv2_to_use?=
	=?utf-8?b?IE1ha28gMC43LjMu?=
Message-ID: <3XyMCb23cGzPlf@mail.python.org>

http://hg.python.org/benchmarks/rev/d456cee3fd8a
changeset:   191:d456cee3fd8a
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 08 19:07:59 2012 -0500
summary:
  Update mako_v2 to use Mako 0.7.3.

Once speed.python.org is up and running and relying on historic data
then upgrading library versions probably should be avoided.

files:
  lib/Mako-0.7.3/CHANGES                                        |   847 ++++++
  lib/Mako-0.7.3/LICENSE                                        |    20 +
  lib/Mako-0.7.3/MANIFEST.in                                    |    11 +
  lib/Mako-0.7.3/Mako.egg-info/PKG-INFO                         |    71 +
  lib/Mako-0.7.3/Mako.egg-info/SOURCES.txt                      |   171 +
  lib/Mako-0.7.3/Mako.egg-info/dependency_links.txt             |     1 +
  lib/Mako-0.7.3/Mako.egg-info/entry_points.txt                 |    14 +
  lib/Mako-0.7.3/Mako.egg-info/not-zip-safe                     |     1 +
  lib/Mako-0.7.3/Mako.egg-info/requires.txt                     |     4 +
  lib/Mako-0.7.3/Mako.egg-info/top_level.txt                    |     1 +
  lib/Mako-0.7.3/PKG-INFO                                       |    71 +
  lib/Mako-0.7.3/README.rst                                     |    52 +
  lib/Mako-0.7.3/distribute_setup.py                            |   485 +++
  lib/Mako-0.7.3/doc/_sources/caching.txt                       |   393 +++
  lib/Mako-0.7.3/doc/_sources/defs.txt                          |   622 +++++
  lib/Mako-0.7.3/doc/_sources/filtering.txt                     |   344 ++
  lib/Mako-0.7.3/doc/_sources/index.txt                         |    22 +
  lib/Mako-0.7.3/doc/_sources/inheritance.txt                   |   534 ++++
  lib/Mako-0.7.3/doc/_sources/namespaces.txt                    |   349 ++
  lib/Mako-0.7.3/doc/_sources/runtime.txt                       |   448 +++
  lib/Mako-0.7.3/doc/_sources/syntax.txt                        |   469 +++
  lib/Mako-0.7.3/doc/_sources/unicode.txt                       |   345 ++
  lib/Mako-0.7.3/doc/_sources/usage.txt                         |   520 ++++
  lib/Mako-0.7.3/doc/_static/basic.css                          |   540 ++++
  lib/Mako-0.7.3/doc/_static/comment-bright.png                 |   Bin 
  lib/Mako-0.7.3/doc/_static/comment-close.png                  |   Bin 
  lib/Mako-0.7.3/doc/_static/comment.png                        |   Bin 
  lib/Mako-0.7.3/doc/_static/default.css                        |   256 ++
  lib/Mako-0.7.3/doc/_static/docs.css                           |   438 +++
  lib/Mako-0.7.3/doc/_static/doctools.js                        |   247 +
  lib/Mako-0.7.3/doc/_static/down-pressed.png                   |   Bin 
  lib/Mako-0.7.3/doc/_static/down.png                           |   Bin 
  lib/Mako-0.7.3/doc/_static/file.png                           |   Bin 
  lib/Mako-0.7.3/doc/_static/jquery.js                          |   154 +
  lib/Mako-0.7.3/doc/_static/makoLogo.png                       |   Bin 
  lib/Mako-0.7.3/doc/_static/minus.png                          |   Bin 
  lib/Mako-0.7.3/doc/_static/plus.png                           |   Bin 
  lib/Mako-0.7.3/doc/_static/pygments.css                       |    62 +
  lib/Mako-0.7.3/doc/_static/searchtools.js                     |   560 ++++
  lib/Mako-0.7.3/doc/_static/sidebar.js                         |   151 +
  lib/Mako-0.7.3/doc/_static/site.css                           |    86 +
  lib/Mako-0.7.3/doc/_static/underscore.js                      |    23 +
  lib/Mako-0.7.3/doc/_static/up-pressed.png                     |   Bin 
  lib/Mako-0.7.3/doc/_static/up.png                             |   Bin 
  lib/Mako-0.7.3/doc/_static/websupport.js                      |   808 ++++++
  lib/Mako-0.7.3/doc/build/Makefile                             |   137 +
  lib/Mako-0.7.3/doc/build/builder/__init__.py                  |     0 
  lib/Mako-0.7.3/doc/build/builder/builders.py                  |    97 +
  lib/Mako-0.7.3/doc/build/builder/util.py                      |    12 +
  lib/Mako-0.7.3/doc/build/caching.rst                          |   393 +++
  lib/Mako-0.7.3/doc/build/conf.py                              |   287 ++
  lib/Mako-0.7.3/doc/build/defs.rst                             |   622 +++++
  lib/Mako-0.7.3/doc/build/filtering.rst                        |   344 ++
  lib/Mako-0.7.3/doc/build/index.rst                            |    22 +
  lib/Mako-0.7.3/doc/build/inheritance.rst                      |   534 ++++
  lib/Mako-0.7.3/doc/build/namespaces.rst                       |   349 ++
  lib/Mako-0.7.3/doc/build/runtime.rst                          |   448 +++
  lib/Mako-0.7.3/doc/build/static/docs.css                      |   438 +++
  lib/Mako-0.7.3/doc/build/static/makoLogo.png                  |   Bin 
  lib/Mako-0.7.3/doc/build/static/site.css                      |    86 +
  lib/Mako-0.7.3/doc/build/syntax.rst                           |   469 +++
  lib/Mako-0.7.3/doc/build/templates/base.mako                  |    60 +
  lib/Mako-0.7.3/doc/build/templates/genindex.mako              |    77 +
  lib/Mako-0.7.3/doc/build/templates/layout.mako                |   199 +
  lib/Mako-0.7.3/doc/build/templates/page.mako                  |     2 +
  lib/Mako-0.7.3/doc/build/templates/rtd_layout.mako            |   174 +
  lib/Mako-0.7.3/doc/build/templates/search.mako                |    25 +
  lib/Mako-0.7.3/doc/build/unicode.rst                          |   345 ++
  lib/Mako-0.7.3/doc/build/usage.rst                            |   520 ++++
  lib/Mako-0.7.3/doc/caching.html                               |   779 ++++++
  lib/Mako-0.7.3/doc/defs.html                                  |   728 +++++
  lib/Mako-0.7.3/doc/filtering.html                             |   478 +++
  lib/Mako-0.7.3/doc/genindex.html                              |   916 +++++++
  lib/Mako-0.7.3/doc/index.html                                 |   230 +
  lib/Mako-0.7.3/doc/inheritance.html                           |   673 +++++
  lib/Mako-0.7.3/doc/namespaces.html                            |   649 +++++
  lib/Mako-0.7.3/doc/runtime.html                               |   710 +++++
  lib/Mako-0.7.3/doc/search.html                                |   162 +
  lib/Mako-0.7.3/doc/searchindex.js                             |     1 +
  lib/Mako-0.7.3/doc/syntax.html                                |   596 ++++
  lib/Mako-0.7.3/doc/unicode.html                               |   476 +++
  lib/Mako-0.7.3/doc/usage.html                                 |  1057 ++++++++
  lib/Mako-0.7.3/examples/bench/basic.py                        |   191 +
  lib/Mako-0.7.3/examples/bench/cheetah/footer.tmpl             |     2 +
  lib/Mako-0.7.3/examples/bench/cheetah/header.tmpl             |     5 +
  lib/Mako-0.7.3/examples/bench/cheetah/template.tmpl           |    31 +
  lib/Mako-0.7.3/examples/bench/django/templatetags/__init__.py |     0 
  lib/Mako-0.7.3/examples/bench/django/templatetags/bench.py    |     8 +
  lib/Mako-0.7.3/examples/bench/kid/base.kid                    |    15 +
  lib/Mako-0.7.3/examples/bench/kid/template.kid                |    22 +
  lib/Mako-0.7.3/examples/bench/myghty/base.myt                 |    29 +
  lib/Mako-0.7.3/examples/bench/myghty/template.myt             |    30 +
  lib/Mako-0.7.3/examples/wsgi/run_wsgi.py                      |    78 +
  lib/Mako-0.7.3/mako/__init__.py                               |     9 +
  lib/Mako-0.7.3/mako/_ast_util.py                              |   839 ++++++
  lib/Mako-0.7.3/mako/ast.py                                    |   151 +
  lib/Mako-0.7.3/mako/cache.py                                  |   236 +
  lib/Mako-0.7.3/mako/codegen.py                                |  1215 +++++++++
  lib/Mako-0.7.3/mako/exceptions.py                             |   362 ++
  lib/Mako-0.7.3/mako/ext/__init__.py                           |     0 
  lib/Mako-0.7.3/mako/ext/autohandler.py                        |    65 +
  lib/Mako-0.7.3/mako/ext/babelplugin.py                        |   132 +
  lib/Mako-0.7.3/mako/ext/beaker_cache.py                       |    70 +
  lib/Mako-0.7.3/mako/ext/preprocessors.py                      |    20 +
  lib/Mako-0.7.3/mako/ext/pygmentplugin.py                      |   122 +
  lib/Mako-0.7.3/mako/ext/turbogears.py                         |    57 +
  lib/Mako-0.7.3/mako/filters.py                                |   191 +
  lib/Mako-0.7.3/mako/lexer.py                                  |   442 +++
  lib/Mako-0.7.3/mako/lookup.py                                 |   354 ++
  lib/Mako-0.7.3/mako/parsetree.py                              |   596 ++++
  lib/Mako-0.7.3/mako/pygen.py                                  |   283 ++
  lib/Mako-0.7.3/mako/pyparser.py                               |   551 ++++
  lib/Mako-0.7.3/mako/runtime.py                                |   841 ++++++
  lib/Mako-0.7.3/mako/template.py                               |   650 +++++
  lib/Mako-0.7.3/mako/util.py                                   |   438 +++
  lib/Mako-0.7.3/scripts/mako-render                            |    46 +
  lib/Mako-0.7.3/setup.cfg                                      |     5 +
  lib/Mako-0.7.3/setup.py                                       |    62 +
  lib/Mako-0.7.3/test/__init__.py                               |   145 +
  lib/Mako-0.7.3/test/foo/__init__.py                           |     0 
  lib/Mako-0.7.3/test/foo/test_ns.py                            |     7 +
  lib/Mako-0.7.3/test/sample_module_namespace.py                |     7 +
  lib/Mako-0.7.3/test/templates/badbom.html                     |     2 +
  lib/Mako-0.7.3/test/templates/bom.html                        |     1 +
  lib/Mako-0.7.3/test/templates/bommagic.html                   |     2 +
  lib/Mako-0.7.3/test/templates/chs_unicode.html                |    11 +
  lib/Mako-0.7.3/test/templates/chs_unicode_py3k.html           |    11 +
  lib/Mako-0.7.3/test/templates/chs_utf8.html                   |    17 +
  lib/Mako-0.7.3/test/templates/crlf.html                       |    19 +
  lib/Mako-0.7.3/test/templates/foo/modtest.html.py             |    25 +
  lib/Mako-0.7.3/test/templates/gettext.mako                    |    89 +
  lib/Mako-0.7.3/test/templates/index.html                      |     1 +
  lib/Mako-0.7.3/test/templates/internationalization.html       |   920 +++++++
  lib/Mako-0.7.3/test/templates/modtest.html                    |     1 +
  lib/Mako-0.7.3/test/templates/othersubdir/foo.html            |     0 
  lib/Mako-0.7.3/test/templates/read_unicode.html               |    10 +
  lib/Mako-0.7.3/test/templates/read_unicode_py3k.html          |    10 +
  lib/Mako-0.7.3/test/templates/runtimeerr.html                 |     4 +
  lib/Mako-0.7.3/test/templates/runtimeerr_py3k.html            |     4 +
  lib/Mako-0.7.3/test/templates/subdir/foo/modtest.html.py      |    25 +
  lib/Mako-0.7.3/test/templates/subdir/incl.html                |     2 +
  lib/Mako-0.7.3/test/templates/subdir/index.html               |     3 +
  lib/Mako-0.7.3/test/templates/subdir/modtest.html             |     1 +
  lib/Mako-0.7.3/test/templates/unicode.html                    |     2 +
  lib/Mako-0.7.3/test/templates/unicode_arguments.html          |    10 +
  lib/Mako-0.7.3/test/templates/unicode_arguments_py3k.html     |    10 +
  lib/Mako-0.7.3/test/templates/unicode_code.html               |     7 +
  lib/Mako-0.7.3/test/templates/unicode_code_py3k.html          |     7 +
  lib/Mako-0.7.3/test/templates/unicode_expr.html               |     2 +
  lib/Mako-0.7.3/test/templates/unicode_expr_py3k.html          |     2 +
  lib/Mako-0.7.3/test/templates/unicode_runtime_error.html      |     2 +
  lib/Mako-0.7.3/test/templates/unicode_syntax_error.html       |     2 +
  lib/Mako-0.7.3/test/test_ast.py                               |   334 ++
  lib/Mako-0.7.3/test/test_babelplugin.py                       |    44 +
  lib/Mako-0.7.3/test/test_block.py                             |   569 ++++
  lib/Mako-0.7.3/test/test_cache.py                             |   557 ++++
  lib/Mako-0.7.3/test/test_call.py                              |   515 ++++
  lib/Mako-0.7.3/test/test_decorators.py                        |   110 +
  lib/Mako-0.7.3/test/test_def.py                               |   678 +++++
  lib/Mako-0.7.3/test/test_exceptions.py                        |   300 ++
  lib/Mako-0.7.3/test/test_filters.py                           |   335 ++
  lib/Mako-0.7.3/test/test_inheritance.py                       |   350 ++
  lib/Mako-0.7.3/test/test_lexer.py                             |   871 +++++++
  lib/Mako-0.7.3/test/test_lookup.py                            |   104 +
  lib/Mako-0.7.3/test/test_loop.py                              |   295 ++
  lib/Mako-0.7.3/test/test_lru.py                               |   111 +
  lib/Mako-0.7.3/test/test_namespace.py                         |   792 ++++++
  lib/Mako-0.7.3/test/test_pygen.py                             |   252 ++
  lib/Mako-0.7.3/test/test_template.py                          |  1242 ++++++++++
  lib/Mako-0.7.3/test/test_tgplugin.py                          |    42 +
  lib/Mako-0.7.3/test/test_util.py                              |    50 +
  lib/Mako-0.7.3/test/util.py                                   |     7 +
  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                          |   620 ----
  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                       |   447 ---
  lib/mako-0.7.2/doc/_sources/syntax.txt                        |   469 ---
  lib/mako-0.7.2/doc/_sources/unicode.txt                       |   344 --
  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                             |   620 ----
  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                          |   447 ---
  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                          |   344 --
  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 -
  perf.py                                                       |     2 +-
  345 files changed, 39283 insertions(+), 39130 deletions(-)


diff --git a/lib/Mako-0.7.3/CHANGES b/lib/Mako-0.7.3/CHANGES
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/CHANGES
@@ -0,0 +1,847 @@
+
+0.7.3
+- [bug] legacy_html_escape function, used when
+  Markupsafe isn't installed, was using an inline-compiled
+  regexp which causes major slowdowns on Python 3.3;
+  is now precompiled.
+
+- [bug] AST supporting now supports tuple-packed
+  function arguments inside pure-python def
+  or lambda expressions.  [ticket:201]
+
+- [bug] Fixed Py3K bug in the Babel extension.
+
+- [bug] Fixed the "filter" attribute of the
+  <%text> tag so that it pulls locally specified
+  identifiers from the context the same
+  way as that of <%block> and <%filter>.
+
+- [bug] Fixed bug in plugin loader to correctly
+  raise exception when non-existent plugin
+  is specified.
+
+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.3/LICENSE b/lib/Mako-0.7.3/LICENSE
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/MANIFEST.in b/lib/Mako-0.7.3/MANIFEST.in
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/Mako.egg-info/PKG-INFO b/lib/Mako-0.7.3/Mako.egg-info/PKG-INFO
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/Mako.egg-info/PKG-INFO
@@ -0,0 +1,71 @@
+Metadata-Version: 1.0
+Name: Mako
+Version: 0.7.3
+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.3/Mako.egg-info/SOURCES.txt b/lib/Mako-0.7.3/Mako.egg-info/SOURCES.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/Mako.egg-info/dependency_links.txt b/lib/Mako-0.7.3/Mako.egg-info/dependency_links.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/Mako.egg-info/dependency_links.txt
@@ -0,0 +1,1 @@
+
diff --git a/lib/Mako-0.7.3/Mako.egg-info/entry_points.txt b/lib/Mako-0.7.3/Mako.egg-info/entry_points.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/Mako.egg-info/not-zip-safe b/lib/Mako-0.7.3/Mako.egg-info/not-zip-safe
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/Mako.egg-info/not-zip-safe
@@ -0,0 +1,1 @@
+
diff --git a/lib/Mako-0.7.3/Mako.egg-info/requires.txt b/lib/Mako-0.7.3/Mako.egg-info/requires.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/Mako.egg-info/top_level.txt b/lib/Mako-0.7.3/Mako.egg-info/top_level.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/Mako.egg-info/top_level.txt
@@ -0,0 +1,1 @@
+mako
diff --git a/lib/Mako-0.7.3/PKG-INFO b/lib/Mako-0.7.3/PKG-INFO
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/PKG-INFO
@@ -0,0 +1,71 @@
+Metadata-Version: 1.0
+Name: Mako
+Version: 0.7.3
+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.3/README.rst b/lib/Mako-0.7.3/README.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/distribute_setup.py b/lib/Mako-0.7.3/distribute_setup.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/caching.txt b/lib/Mako-0.7.3/doc/_sources/caching.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/defs.txt b/lib/Mako-0.7.3/doc/_sources/defs.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/filtering.txt b/lib/Mako-0.7.3/doc/_sources/filtering.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/index.txt b/lib/Mako-0.7.3/doc/_sources/index.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/inheritance.txt b/lib/Mako-0.7.3/doc/_sources/inheritance.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/namespaces.txt b/lib/Mako-0.7.3/doc/_sources/namespaces.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/runtime.txt b/lib/Mako-0.7.3/doc/_sources/runtime.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/syntax.txt b/lib/Mako-0.7.3/doc/_sources/syntax.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/unicode.txt b/lib/Mako-0.7.3/doc/_sources/unicode.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_sources/usage.txt b/lib/Mako-0.7.3/doc/_sources/usage.txt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/basic.css b/lib/Mako-0.7.3/doc/_static/basic.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/comment-bright.png b/lib/Mako-0.7.3/doc/_static/comment-bright.png
new file mode 100644
index 0000000000000000000000000000000000000000..551517b8c83b76f734ff791f847829a760ad1903
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/comment-close.png b/lib/Mako-0.7.3/doc/_static/comment-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b54be46da3f0d4a5061da289dc91d8a2cdbc9c
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/comment.png b/lib/Mako-0.7.3/doc/_static/comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..92feb52b8824c6b0f59b658b1196c61de9162a95
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/default.css b/lib/Mako-0.7.3/doc/_static/default.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/docs.css b/lib/Mako-0.7.3/doc/_static/docs.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/doctools.js b/lib/Mako-0.7.3/doc/_static/doctools.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/down-pressed.png b/lib/Mako-0.7.3/doc/_static/down-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7ad782782e4f8e39b0c6e15c7344700cdd2527
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/down.png b/lib/Mako-0.7.3/doc/_static/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..3003a88770de3977d47a2ba69893436a2860f9e7
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/file.png b/lib/Mako-0.7.3/doc/_static/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..d18082e397e7e54f20721af768c4c2983258f1b4
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/jquery.js b/lib/Mako-0.7.3/doc/_static/jquery.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/makoLogo.png b/lib/Mako-0.7.3/doc/_static/makoLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c43c087eb48ebfc2223b76cf3df2fa7868c2a72b
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/minus.png b/lib/Mako-0.7.3/doc/_static/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..da1c5620d10c047525a467a425abe9ff5269cfc2
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/plus.png b/lib/Mako-0.7.3/doc/_static/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3cb37425ea68b39ffa7b2e5fb69161275a87541
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/pygments.css b/lib/Mako-0.7.3/doc/_static/pygments.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/searchtools.js b/lib/Mako-0.7.3/doc/_static/searchtools.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/sidebar.js b/lib/Mako-0.7.3/doc/_static/sidebar.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/site.css b/lib/Mako-0.7.3/doc/_static/site.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/_static/site.css
@@ -0,0 +1,86 @@
+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;
+}
+.slogan {
+    margin-top:10px;
+}
+#gittip_nav {
+    float:right;
+    margin:10px 0px 0px 0px;
+}
+
+.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.3/doc/_static/underscore.js b/lib/Mako-0.7.3/doc/_static/underscore.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/_static/up-pressed.png b/lib/Mako-0.7.3/doc/_static/up-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd587afee2fe38989383ff82010147ea56b93dd
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/up.png b/lib/Mako-0.7.3/doc/_static/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..b94625680b4a4b9647c3a6f3f283776930696aa9
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/_static/websupport.js b/lib/Mako-0.7.3/doc/_static/websupport.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/Makefile b/lib/Mako-0.7.3/doc/build/Makefile
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/builder/__init__.py b/lib/Mako-0.7.3/doc/build/builder/__init__.py
new file mode 100644
diff --git a/lib/Mako-0.7.3/doc/build/builder/builders.py b/lib/Mako-0.7.3/doc/build/builder/builders.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/builder/util.py b/lib/Mako-0.7.3/doc/build/builder/util.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/caching.rst b/lib/Mako-0.7.3/doc/build/caching.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/conf.py b/lib/Mako-0.7.3/doc/build/conf.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/defs.rst b/lib/Mako-0.7.3/doc/build/defs.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/filtering.rst b/lib/Mako-0.7.3/doc/build/filtering.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/index.rst b/lib/Mako-0.7.3/doc/build/index.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/inheritance.rst b/lib/Mako-0.7.3/doc/build/inheritance.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/namespaces.rst b/lib/Mako-0.7.3/doc/build/namespaces.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/runtime.rst b/lib/Mako-0.7.3/doc/build/runtime.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/static/docs.css b/lib/Mako-0.7.3/doc/build/static/docs.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/static/makoLogo.png b/lib/Mako-0.7.3/doc/build/static/makoLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c43c087eb48ebfc2223b76cf3df2fa7868c2a72b
GIT binary patch
[stripped]
diff --git a/lib/Mako-0.7.3/doc/build/static/site.css b/lib/Mako-0.7.3/doc/build/static/site.css
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/build/static/site.css
@@ -0,0 +1,86 @@
+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;
+}
+.slogan {
+    margin-top:10px;
+}
+#gittip_nav {
+    float:right;
+    margin:10px 0px 0px 0px;
+}
+
+.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.3/doc/build/syntax.rst b/lib/Mako-0.7.3/doc/build/syntax.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/templates/base.mako b/lib/Mako-0.7.3/doc/build/templates/base.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/build/templates/base.mako
@@ -0,0 +1,60 @@
+<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">
+
+    % if toolbar:
+    <div id="gittip_nav">
+    <iframe style="border: 0; margin: 0; padding: 0;"
+    src="https://www.gittip.com/zzzeek/widget.html"
+    width="48pt" height="20pt"></iframe>
+    </div>
+    % endif
+
+    <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.3/doc/build/templates/genindex.mako b/lib/Mako-0.7.3/doc/build/templates/genindex.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/templates/layout.mako b/lib/Mako-0.7.3/doc/build/templates/layout.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/templates/page.mako b/lib/Mako-0.7.3/doc/build/templates/page.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/templates/rtd_layout.mako b/lib/Mako-0.7.3/doc/build/templates/rtd_layout.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/templates/search.mako b/lib/Mako-0.7.3/doc/build/templates/search.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/unicode.rst b/lib/Mako-0.7.3/doc/build/unicode.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/build/usage.rst b/lib/Mako-0.7.3/doc/build/usage.rst
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/caching.html b/lib/Mako-0.7.3/doc/caching.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/caching.html
@@ -0,0 +1,779 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.4.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.3/doc/defs.html b/lib/Mako-0.7.3/doc/defs.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/defs.html
@@ -0,0 +1,728 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/filtering.html b/lib/Mako-0.7.3/doc/filtering.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/filtering.html
@@ -0,0 +1,478 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/genindex.html b/lib/Mako-0.7.3/doc/genindex.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/genindex.html
@@ -0,0 +1,916 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/index.html b/lib/Mako-0.7.3/doc/index.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/index.html
@@ -0,0 +1,230 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/inheritance.html b/lib/Mako-0.7.3/doc/inheritance.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/inheritance.html
@@ -0,0 +1,673 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/namespaces.html b/lib/Mako-0.7.3/doc/namespaces.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/namespaces.html
@@ -0,0 +1,649 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/runtime.html b/lib/Mako-0.7.3/doc/runtime.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/runtime.html
@@ -0,0 +1,710 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/search.html b/lib/Mako-0.7.3/doc/search.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/search.html
@@ -0,0 +1,162 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/searchindex.js b/lib/Mako-0.7.3/doc/searchindex.js
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/doc/syntax.html b/lib/Mako-0.7.3/doc/syntax.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/syntax.html
@@ -0,0 +1,596 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/unicode.html b/lib/Mako-0.7.3/doc/unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/unicode.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>
+    
+                The Unicode Chapter
+             &mdash; 
+    Mako 0.7.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/doc/usage.html b/lib/Mako-0.7.3/doc/usage.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/doc/usage.html
@@ -0,0 +1,1057 @@
+<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.3 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.3',
+          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.3 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.3 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.3</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.3 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.3/examples/bench/basic.py b/lib/Mako-0.7.3/examples/bench/basic.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/bench/cheetah/footer.tmpl b/lib/Mako-0.7.3/examples/bench/cheetah/footer.tmpl
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/examples/bench/cheetah/footer.tmpl
@@ -0,0 +1,2 @@
+<div id="footer">
+</div>
diff --git a/lib/Mako-0.7.3/examples/bench/cheetah/header.tmpl b/lib/Mako-0.7.3/examples/bench/cheetah/header.tmpl
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/examples/bench/cheetah/header.tmpl
@@ -0,0 +1,5 @@
+<div id="header">
+  <h1>$title</h1>
+</div>
+
+
diff --git a/lib/Mako-0.7.3/examples/bench/cheetah/template.tmpl b/lib/Mako-0.7.3/examples/bench/cheetah/template.tmpl
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/bench/django/templatetags/__init__.py b/lib/Mako-0.7.3/examples/bench/django/templatetags/__init__.py
new file mode 100644
diff --git a/lib/Mako-0.7.3/examples/bench/django/templatetags/bench.py b/lib/Mako-0.7.3/examples/bench/django/templatetags/bench.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/bench/kid/base.kid b/lib/Mako-0.7.3/examples/bench/kid/base.kid
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/bench/kid/template.kid b/lib/Mako-0.7.3/examples/bench/kid/template.kid
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/bench/myghty/base.myt b/lib/Mako-0.7.3/examples/bench/myghty/base.myt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/bench/myghty/template.myt b/lib/Mako-0.7.3/examples/bench/myghty/template.myt
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/examples/wsgi/run_wsgi.py b/lib/Mako-0.7.3/examples/wsgi/run_wsgi.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/__init__.py b/lib/Mako-0.7.3/mako/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3'
+
diff --git a/lib/Mako-0.7.3/mako/_ast_util.py b/lib/Mako-0.7.3/mako/_ast_util.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/ast.py b/lib/Mako-0.7.3/mako/ast.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/cache.py b/lib/Mako-0.7.3/mako/cache.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/codegen.py b/lib/Mako-0.7.3/mako/codegen.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/mako/codegen.py
@@ -0,0 +1,1215 @@
+# 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 visitTextTag(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)
+
+    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.3/mako/exceptions.py b/lib/Mako-0.7.3/mako/exceptions.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/ext/__init__.py b/lib/Mako-0.7.3/mako/ext/__init__.py
new file mode 100644
diff --git a/lib/Mako-0.7.3/mako/ext/autohandler.py b/lib/Mako-0.7.3/mako/ext/autohandler.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/ext/babelplugin.py b/lib/Mako-0.7.3/mako/ext/babelplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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, util
+
+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 not util.py3k and 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.3/mako/ext/beaker_cache.py b/lib/Mako-0.7.3/mako/ext/beaker_cache.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/ext/preprocessors.py b/lib/Mako-0.7.3/mako/ext/preprocessors.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/ext/pygmentplugin.py b/lib/Mako-0.7.3/mako/ext/pygmentplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/ext/turbogears.py b/lib/Mako-0.7.3/mako/ext/turbogears.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/filters.py b/lib/Mako-0.7.3/mako/filters.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/mako/filters.py
@@ -0,0 +1,191 @@
+# 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
+
+LEGACY_HTML_ESCAPE_RE = re.compile(r'([&<"\'>])')
+
+def legacy_html_escape(string):
+    """legacy HTML escape for non-unicode mode."""
+
+    return LEGACY_HTML_ESCAPE_RE.sub(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.3/mako/lexer.py b/lib/Mako-0.7.3/mako/lexer.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/lookup.py b/lib/Mako-0.7.3/mako/lookup.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/parsetree.py b/lib/Mako-0.7.3/mako/parsetree.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/mako/parsetree.py
@@ -0,0 +1,596 @@
+# 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)
+
+    def undeclared_identifiers(self):
+        return self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys()).union(
+                        self.expression_undeclared_identifiers
+                    )
+
+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.3/mako/pygen.py b/lib/Mako-0.7.3/mako/pygen.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/pyparser.py b/lib/Mako-0.7.3/mako/pyparser.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/mako/pyparser.py
@@ -0,0 +1,551 @@
+# 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 _expand_tuples(self, args):
+            for arg in args:
+                if isinstance(arg, _ast.Tuple):
+                    for n in arg.elts:
+                        yield n
+                else:
+                    yield arg
+
+        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 self._expand_tuples(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 _expand_tuples(self, args):
+            for arg in args:
+                if isinstance(arg, tuple):
+                    for n in arg:
+                        yield n
+                else:
+                    yield arg
+
+        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 self._expand_tuples(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.3/mako/runtime.py b/lib/Mako-0.7.3/mako/runtime.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/template.py b/lib/Mako-0.7.3/mako/template.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/mako/util.py b/lib/Mako-0.7.3/mako/util.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/mako/util.py
@@ -0,0 +1,438 @@
+# 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)
+py25 = sys.version_info >= (2, 5)
+jython = sys.platform.startswith('java')
+win32 = sys.platform.startswith('win')
+pypy = hasattr(sys, 'pypy_version_info')
+
+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 not py25:
+    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:
+                from mako import exceptions
+                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.3/scripts/mako-render b/lib/Mako-0.7.3/scripts/mako-render
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/setup.cfg b/lib/Mako-0.7.3/setup.cfg
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/lib/Mako-0.7.3/setup.py b/lib/Mako-0.7.3/setup.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/__init__.py b/lib/Mako-0.7.3/test/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/__init__.py
@@ -0,0 +1,145 @@
+from mako.template import Template
+import unittest, os
+from mako.util import py3k, py26, py25
+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_python_2(fn):
+    return skip_if(lambda: py3k, "Requires Python 2.xx")(fn)
+
+def requires_python_26_or_greater(fn):
+    return skip_if(lambda: not py26, "Requires Python 2.6 or greater")(fn)
+
+def requires_python_25_or_greater(fn):
+    return skip_if(lambda: not py25, "Requires Python 2.5 or greater")(fn)
+
+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.3/test/foo/__init__.py b/lib/Mako-0.7.3/test/foo/__init__.py
new file mode 100644
diff --git a/lib/Mako-0.7.3/test/foo/test_ns.py b/lib/Mako-0.7.3/test/foo/test_ns.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/sample_module_namespace.py b/lib/Mako-0.7.3/test/sample_module_namespace.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/badbom.html b/lib/Mako-0.7.3/test/templates/badbom.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/bom.html b/lib/Mako-0.7.3/test/templates/bom.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/bommagic.html b/lib/Mako-0.7.3/test/templates/bommagic.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/chs_unicode.html b/lib/Mako-0.7.3/test/templates/chs_unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/chs_unicode_py3k.html b/lib/Mako-0.7.3/test/templates/chs_unicode_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/chs_utf8.html b/lib/Mako-0.7.3/test/templates/chs_utf8.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/crlf.html b/lib/Mako-0.7.3/test/templates/crlf.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/foo/modtest.html.py b/lib/Mako-0.7.3/test/templates/foo/modtest.html.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/gettext.mako b/lib/Mako-0.7.3/test/templates/gettext.mako
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/index.html b/lib/Mako-0.7.3/test/templates/index.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/templates/index.html
@@ -0,0 +1,1 @@
+this is index
\ No newline at end of file
diff --git a/lib/Mako-0.7.3/test/templates/internationalization.html b/lib/Mako-0.7.3/test/templates/internationalization.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/modtest.html b/lib/Mako-0.7.3/test/templates/modtest.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/othersubdir/foo.html b/lib/Mako-0.7.3/test/templates/othersubdir/foo.html
new file mode 100644
diff --git a/lib/Mako-0.7.3/test/templates/read_unicode.html b/lib/Mako-0.7.3/test/templates/read_unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/read_unicode_py3k.html b/lib/Mako-0.7.3/test/templates/read_unicode_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/runtimeerr.html b/lib/Mako-0.7.3/test/templates/runtimeerr.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/runtimeerr_py3k.html b/lib/Mako-0.7.3/test/templates/runtimeerr_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/subdir/foo/modtest.html.py b/lib/Mako-0.7.3/test/templates/subdir/foo/modtest.html.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/subdir/incl.html b/lib/Mako-0.7.3/test/templates/subdir/incl.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/templates/subdir/incl.html
@@ -0,0 +1,2 @@
+
+    this is include 2
diff --git a/lib/Mako-0.7.3/test/templates/subdir/index.html b/lib/Mako-0.7.3/test/templates/subdir/index.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/templates/subdir/index.html
@@ -0,0 +1,3 @@
+
+    this is sub index
+    <%include file="incl.html"/>
diff --git a/lib/Mako-0.7.3/test/templates/subdir/modtest.html b/lib/Mako-0.7.3/test/templates/subdir/modtest.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode.html b/lib/Mako-0.7.3/test/templates/unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_arguments.html b/lib/Mako-0.7.3/test/templates/unicode_arguments.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_arguments_py3k.html b/lib/Mako-0.7.3/test/templates/unicode_arguments_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_code.html b/lib/Mako-0.7.3/test/templates/unicode_code.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_code_py3k.html b/lib/Mako-0.7.3/test/templates/unicode_code_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_expr.html b/lib/Mako-0.7.3/test/templates/unicode_expr.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_expr_py3k.html b/lib/Mako-0.7.3/test/templates/unicode_expr_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_runtime_error.html b/lib/Mako-0.7.3/test/templates/unicode_runtime_error.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/templates/unicode_syntax_error.html b/lib/Mako-0.7.3/test/templates/unicode_syntax_error.html
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_ast.py b/lib/Mako-0.7.3/test/test_ast.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/test_ast.py
@@ -0,0 +1,334 @@
+import unittest
+
+from mako import ast, exceptions, pyparser, util
+from test import eq_, requires_python_2
+
+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']))
+
+    @requires_python_2
+    def test_locate_identifiers_15(self):
+        code = """
+def t1((x,y)):
+    return x+5, y+4
+
+t2 = lambda (x,y):(x+5, y+4)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['t1', 't2']))
+        eq_(parsed.undeclared_identifiers, set())
+
+    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.3/test/test_babelplugin.py b/lib/Mako-0.7.3/test/test_babelplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_block.py b/lib/Mako-0.7.3/test/test_block.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_cache.py b/lib/Mako-0.7.3/test/test_cache.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_call.py b/lib/Mako-0.7.3/test/test_call.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_decorators.py b/lib/Mako-0.7.3/test/test_decorators.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_def.py b/lib/Mako-0.7.3/test/test_def.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_exceptions.py b/lib/Mako-0.7.3/test/test_exceptions.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/test_exceptions.py
@@ -0,0 +1,300 @@
+# -*- 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, \
+    requires_python_25_or_greater
+
+
+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)
+
+    @requires_python_25_or_greater
+    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'))
+
+
+    @requires_python_25_or_greater
+    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.3/test/test_filters.py b/lib/Mako-0.7.3/test/test_filters.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/test_filters.py
@@ -0,0 +1,335 @@
+# -*- coding: utf-8 -*-
+
+from mako.template import Template
+import unittest
+from test import TemplateTest, eq_, requires_python_2
+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;"
+        )
+
+    @requires_python_2
+    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_text_via_context(self):
+        t = Template("""
+            <%text filter="myfilter">
+                some text
+            </%text>
+        """)
+        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.3/test/test_inheritance.py b/lib/Mako-0.7.3/test/test_inheritance.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_lexer.py b/lib/Mako-0.7.3/test/test_lexer.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_lookup.py b/lib/Mako-0.7.3/test/test_lookup.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_loop.py b/lib/Mako-0.7.3/test/test_loop.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_lru.py b/lib/Mako-0.7.3/test/test_lru.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_namespace.py b/lib/Mako-0.7.3/test/test_namespace.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_pygen.py b/lib/Mako-0.7.3/test/test_pygen.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_template.py b/lib/Mako-0.7.3/test/test_template.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/test_template.py
@@ -0,0 +1,1242 @@
+# -*- 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, \
+    requires_python_26_or_greater, assert_raises, assert_raises_message, \
+    requires_python_2
+
+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'))
+
+    @requires_python_2
+    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()
+        )
+
+    @requires_python_26_or_greater
+    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()
+        )
+
+    @requires_python_26_or_greater
+    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.3/test/test_tgplugin.py b/lib/Mako-0.7.3/test/test_tgplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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.3/test/test_util.py b/lib/Mako-0.7.3/test/test_util.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/test/test_util.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+import os
+import unittest
+from mako import util, exceptions
+from test import eq_, skip_if, assert_raises_message
+
+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
+
+    @skip_if(lambda: util.pypy, "Pypy does this differently")
+    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)
+
+    def test_load_plugin_failure(self):
+        loader = util.PluginLoader("fakegroup")
+        assert_raises_message(
+            exceptions.RuntimeException,
+            "Can't load plugin fakegroup fake",
+            loader.load, "fake"
+        )
diff --git a/lib/Mako-0.7.3/test/util.py b/lib/Mako-0.7.3/test/util.py
new file mode 100644
--- /dev/null
+++ b/lib/Mako-0.7.3/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/lib/mako-0.7.2/CHANGES b/lib/mako-0.7.2/CHANGES
deleted file mode 100644
--- a/lib/mako-0.7.2/CHANGES
+++ /dev/null
@@ -1,825 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/MANIFEST.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/PKG-INFO
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/dependency_links.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-
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
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/entry_points.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-      [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
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/not-zip-safe
+++ /dev/null
@@ -1,1 +0,0 @@
-
diff --git a/lib/mako-0.7.2/Mako.egg-info/requires.txt b/lib/mako-0.7.2/Mako.egg-info/requires.txt
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/requires.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/Mako.egg-info/top_level.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-mako
diff --git a/lib/mako-0.7.2/PKG-INFO b/lib/mako-0.7.2/PKG-INFO
deleted file mode 100644
--- a/lib/mako-0.7.2/PKG-INFO
+++ /dev/null
@@ -1,71 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/README.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-=========================
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/distribute_setup.py
+++ /dev/null
@@ -1,485 +0,0 @@
-#!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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/caching.txt
+++ /dev/null
@@ -1,393 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/defs.txt
+++ /dev/null
@@ -1,622 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/filtering.txt
+++ /dev/null
@@ -1,344 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/index.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/inheritance.txt
+++ /dev/null
@@ -1,534 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/namespaces.txt
+++ /dev/null
@@ -1,349 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/runtime.txt
+++ /dev/null
@@ -1,448 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/syntax.txt
+++ /dev/null
@@ -1,469 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/unicode.txt
+++ /dev/null
@@ -1,345 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_sources/usage.txt
+++ /dev/null
@@ -1,520 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/basic.css
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * 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
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/comment-bright.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/comment-close.png b/lib/mako-0.7.2/doc/_static/comment-close.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/comment-close.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/comment.png b/lib/mako-0.7.2/doc/_static/comment.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/comment.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/default.css b/lib/mako-0.7.2/doc/_static/default.css
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/default.css
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/docs.css
+++ /dev/null
@@ -1,438 +0,0 @@
-/* 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/doctools.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * 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
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/down-pressed.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/down.png b/lib/mako-0.7.2/doc/_static/down.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/down.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/file.png b/lib/mako-0.7.2/doc/_static/file.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/file.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/jquery.js b/lib/mako-0.7.2/doc/_static/jquery.js
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/jquery.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * 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
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/makoLogo.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/minus.png b/lib/mako-0.7.2/doc/_static/minus.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/minus.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/plus.png b/lib/mako-0.7.2/doc/_static/plus.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/plus.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/pygments.css b/lib/mako-0.7.2/doc/_static/pygments.css
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/pygments.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/searchtools.js
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/sidebar.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/site.css
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/underscore.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/up-pressed.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/up.png b/lib/mako-0.7.2/doc/_static/up.png
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/_static/up.png has changed
diff --git a/lib/mako-0.7.2/doc/_static/websupport.js b/lib/mako-0.7.2/doc/_static/websupport.js
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/_static/websupport.js
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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
deleted 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/builder/builders.py
+++ /dev/null
@@ -1,97 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/builder/util.py
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/caching.rst
+++ /dev/null
@@ -1,393 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/conf.py
+++ /dev/null
@@ -1,287 +0,0 @@
-# -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/defs.rst
+++ /dev/null
@@ -1,622 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/filtering.rst
+++ /dev/null
@@ -1,344 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/index.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/inheritance.rst
+++ /dev/null
@@ -1,534 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/namespaces.rst
+++ /dev/null
@@ -1,349 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/runtime.rst
+++ /dev/null
@@ -1,448 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/static/docs.css
+++ /dev/null
@@ -1,438 +0,0 @@
-/* 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
deleted file mode 100644
Binary file lib/mako-0.7.2/doc/build/static/makoLogo.png has changed
diff --git a/lib/mako-0.7.2/doc/build/static/site.css b/lib/mako-0.7.2/doc/build/static/site.css
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/static/site.css
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/syntax.rst
+++ /dev/null
@@ -1,469 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/templates/base.mako
+++ /dev/null
@@ -1,51 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/templates/genindex.mako
+++ /dev/null
@@ -1,77 +0,0 @@
-<%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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/templates/layout.mako
+++ /dev/null
@@ -1,199 +0,0 @@
-## 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/templates/page.mako
+++ /dev/null
@@ -1,2 +0,0 @@
-<%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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/templates/rtd_layout.mako
+++ /dev/null
@@ -1,174 +0,0 @@
-<!-- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/templates/search.mako
+++ /dev/null
@@ -1,25 +0,0 @@
-<%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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/unicode.rst
+++ /dev/null
@@ -1,345 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/build/usage.rst
+++ /dev/null
@@ -1,520 +0,0 @@
-.. _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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/caching.html
+++ /dev/null
@@ -1,777 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/defs.html
+++ /dev/null
@@ -1,726 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/filtering.html
+++ /dev/null
@@ -1,476 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/genindex.html
+++ /dev/null
@@ -1,914 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/index.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/inheritance.html
+++ /dev/null
@@ -1,671 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/namespaces.html
+++ /dev/null
@@ -1,647 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/runtime.html
+++ /dev/null
@@ -1,708 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/search.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/searchindex.js
+++ /dev/null
@@ -1,1 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/syntax.html
+++ /dev/null
@@ -1,594 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/unicode.html
+++ /dev/null
@@ -1,474 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/doc/usage.html
+++ /dev/null
@@ -1,1055 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/basic.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/cheetah/footer.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/cheetah/header.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/cheetah/template.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!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
deleted 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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/django/templatetags/bench.py
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/kid/base.kid
+++ /dev/null
@@ -1,15 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/kid/template.kid
+++ /dev/null
@@ -1,22 +0,0 @@
-<!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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/myghty/base.myt
+++ /dev/null
@@ -1,29 +0,0 @@
-<!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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/bench/myghty/template.myt
+++ /dev/null
@@ -1,30 +0,0 @@
-<%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
deleted file mode 100644
--- a/lib/mako-0.7.2/examples/wsgi/run_wsgi.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/_ast_util.py
+++ /dev/null
@@ -1,839 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ast.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/cache.py
+++ /dev/null
@@ -1,236 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/codegen.py
+++ /dev/null
@@ -1,1209 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/exceptions.py
+++ /dev/null
@@ -1,362 +0,0 @@
-# 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
deleted 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ext/autohandler.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ext/babelplugin.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ext/beaker_cache.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ext/preprocessors.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ext/pygmentplugin.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/ext/turbogears.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/filters.py
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/lexer.py
+++ /dev/null
@@ -1,442 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/lookup.py
+++ /dev/null
@@ -1,354 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/parsetree.py
+++ /dev/null
@@ -1,589 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/pygen.py
+++ /dev/null
@@ -1,283 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/pyparser.py
+++ /dev/null
@@ -1,535 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/runtime.py
+++ /dev/null
@@ -1,841 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/template.py
+++ /dev/null
@@ -1,650 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/mako/util.py
+++ /dev/null
@@ -1,436 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/scripts/mako-render
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/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
deleted file mode 100644
--- a/lib/mako-0.7.2/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[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
deleted file mode 100644
--- a/lib/mako-0.7.2/setup.py
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/__init__.py
+++ /dev/null
@@ -1,135 +0,0 @@
-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
deleted 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/foo/test_ns.py
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/sample_module_namespace.py
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/badbom.html
+++ /dev/null
@@ -1,2 +0,0 @@
-?## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/bom.html
+++ /dev/null
@@ -1,1 +0,0 @@
-?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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/bommagic.html
+++ /dev/null
@@ -1,2 +0,0 @@
-?## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/chs_unicode.html
+++ /dev/null
@@ -1,11 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/chs_unicode_py3k.html
+++ /dev/null
@@ -1,11 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/chs_utf8.html
+++ /dev/null
@@ -1,17 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/crlf.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/foo/modtest.html.py
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/gettext.mako
+++ /dev/null
@@ -1,89 +0,0 @@
-<%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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/index.html
+++ /dev/null
@@ -1,1 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/internationalization.html
+++ /dev/null
@@ -1,920 +0,0 @@
-<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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/modtest.html
+++ /dev/null
@@ -1,1 +0,0 @@
-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
deleted 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/read_unicode.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<% 
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/read_unicode_py3k.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<% 
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/runtimeerr.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<%
-    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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/runtimeerr_py3k.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<%
-    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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/subdir/foo/modtest.html.py
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/subdir/incl.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-    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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/subdir/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-    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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/subdir/modtest.html
+++ /dev/null
@@ -1,1 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode.html
+++ /dev/null
@@ -1,2 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_arguments.html
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_arguments_py3k.html
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_code.html
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_code_py3k.html
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_expr.html
+++ /dev/null
@@ -1,2 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_expr_py3k.html
+++ /dev/null
@@ -1,2 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_runtime_error.html
+++ /dev/null
@@ -1,2 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/templates/unicode_syntax_error.html
+++ /dev/null
@@ -1,2 +0,0 @@
-## -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_ast.py
+++ /dev/null
@@ -1,322 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_babelplugin.py
+++ /dev/null
@@ -1,44 +0,0 @@
-
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_block.py
+++ /dev/null
@@ -1,569 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_cache.py
+++ /dev/null
@@ -1,557 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_call.py
+++ /dev/null
@@ -1,515 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_decorators.py
+++ /dev/null
@@ -1,110 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_def.py
+++ /dev/null
@@ -1,678 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_exceptions.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_filters.py
+++ /dev/null
@@ -1,322 +0,0 @@
-# -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_inheritance.py
+++ /dev/null
@@ -1,350 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_lexer.py
+++ /dev/null
@@ -1,871 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_lookup.py
+++ /dev/null
@@ -1,104 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_loop.py
+++ /dev/null
@@ -1,295 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_lru.py
+++ /dev/null
@@ -1,111 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_namespace.py
+++ /dev/null
@@ -1,792 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_pygen.py
+++ /dev/null
@@ -1,252 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_template.py
+++ /dev/null
@@ -1,1241 +0,0 @@
-# -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_tgplugin.py
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/test_util.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- 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
deleted file mode 100644
--- a/lib/mako-0.7.2/test/util.py
+++ /dev/null
@@ -1,7 +0,0 @@
-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/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1500,7 +1500,7 @@
 
 def MeasureMakoV2(python, options):
     bm_path = Relative("performance/bm_mako_v2.py", python, options)
-    mako_path = Relative("lib/mako-0.7.2", python, options)
+    mako_path = Relative("lib/Mako-0.7.3", python, options)
     bm_env = BuildEnv({"PYTHONPATH": mako_path}, options.inherit_env)
     return MeasureGeneric(python, options, bm_path, bm_env,
                           iteration_scaling=10)

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

From solipsis at pitrou.net  Fri Nov  9 05:55:20 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 09 Nov 2012 05:55:20 +0100
Subject: [Python-checkins] Daily reference leaks (d170844a363f): sum=0
Message-ID: <E1TWgci-0007VR-Ul@ap.vmr.nerim.net>

results for d170844a363f on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Fri Nov  9 11:52:16 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 11:52:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzEzMzAxOiB1c2Ug?=
 =?utf-8?q?ast=2Eliteral=5Feval=28=29_instead_of_eval=28=29_in_Tools/i18n/?=
 =?utf-8?q?msgfmt=2Epy=2E?=
Message-ID: <3XydV81cKSzQDh@mail.python.org>

http://hg.python.org/cpython/rev/058ff991bdcb
changeset:   80324:058ff991bdcb
branch:      2.7
parent:      80320:8b181c75792f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 11:46:19 2012 +0100
summary:
  #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py.  Patch by Serhiy Storchaka.

files:
  Misc/NEWS            |  6 ++++++
  Tools/i18n/msgfmt.py |  6 +++---
  2 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -530,6 +530,12 @@
 
 - Issue #14437: Fix building the _io module under Cygwin.
 
+Tools/Demos
+-----------
+
+- Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py
+  Patch by Serhiy Storchaka.
+
 Documentation
 -------------
 
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -25,8 +25,9 @@
         Display version information and exit.
 """
 
+import os
 import sys
-import os
+import ast
 import getopt
 import struct
 import array
@@ -170,8 +171,7 @@
         l = l.strip()
         if not l:
             continue
-        # XXX: Does this always follow Python escape semantics?
-        l = eval(l)
+        l = ast.literal_eval(l)
         if section == ID:
             msgid += l
         elif section == STR:

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

From python-checkins at python.org  Fri Nov  9 11:52:17 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 11:52:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzEzMzAxOiB1c2Ug?=
 =?utf-8?q?ast=2Eliteral=5Feval=28=29_instead_of_eval=28=29_in_Tools/i18n/?=
 =?utf-8?q?msgfmt=2Epy=2E?=
Message-ID: <3XydV943V2zQDQ@mail.python.org>

http://hg.python.org/cpython/rev/2fa338374719
changeset:   80325:2fa338374719
branch:      3.2
parent:      80321:bb39ca6bcd7a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 11:46:19 2012 +0100
summary:
  #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py.  Patch by Serhiy Storchaka.

files:
  Misc/NEWS            |  6 ++++++
  Tools/i18n/msgfmt.py |  6 +++---
  2 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -682,6 +682,12 @@
 
 - Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
 
+Tools/Demos
+-----------
+
+- Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py
+  Patch by Serhiy Storchaka.
+
 Documentation
 -------------
 
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -24,8 +24,9 @@
         Display version information and exit.
 """
 
+import os
 import sys
-import os
+import ast
 import getopt
 import struct
 import array
@@ -180,8 +181,7 @@
         l = l.strip()
         if not l:
             continue
-        # XXX: Does this always follow Python escape semantics?
-        l = eval(l)
+        l = ast.literal_eval(l)
         if section == ID:
             msgid += l.encode(encoding)
         elif section == STR:

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

From python-checkins at python.org  Fri Nov  9 11:52:18 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 11:52:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2313301=3A_merge_with_3=2E2=2E?=
Message-ID: <3XydVB6QR3zQMq@mail.python.org>

http://hg.python.org/cpython/rev/ea2cb9b69fd9
changeset:   80326:ea2cb9b69fd9
branch:      3.3
parent:      80322:8c7f2f6f3375
parent:      80325:2fa338374719
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 11:51:03 2012 +0100
summary:
  #13301: merge with 3.2.

files:
  Misc/NEWS            |  6 ++++++
  Tools/i18n/msgfmt.py |  6 +++---
  2 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -227,6 +227,12 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a read-only
   source directory.  (Somewhat related to issue #9860.)
 
+Tools/Demos
+-----------
+
+- Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py
+  Patch by Serhiy Storchaka.
+
 Documentation
 -------------
 
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -24,8 +24,9 @@
         Display version information and exit.
 """
 
+import os
 import sys
-import os
+import ast
 import getopt
 import struct
 import array
@@ -180,8 +181,7 @@
         l = l.strip()
         if not l:
             continue
-        # XXX: Does this always follow Python escape semantics?
-        l = eval(l)
+        l = ast.literal_eval(l)
         if section == ID:
             msgid += l.encode(encoding)
         elif section == STR:

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

From python-checkins at python.org  Fri Nov  9 11:52:20 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri,  9 Nov 2012 11:52:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzEzMzAxOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XydVD1lnRzRBH@mail.python.org>

http://hg.python.org/cpython/rev/aa02f7be68f6
changeset:   80327:aa02f7be68f6
parent:      80323:d170844a363f
parent:      80326:ea2cb9b69fd9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 09 11:51:30 2012 +0100
summary:
  #13301: merge with 3.3.

files:
  Misc/NEWS            |  6 ++++++
  Tools/i18n/msgfmt.py |  6 +++---
  2 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -316,6 +316,12 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a read-only
   source directory.  (Somewhat related to issue #9860.)
 
+Tools/Demos
+-----------
+
+- Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py
+  Patch by Serhiy Storchaka.
+
 Documentation
 -------------
 
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -24,8 +24,9 @@
         Display version information and exit.
 """
 
+import os
 import sys
-import os
+import ast
 import getopt
 import struct
 import array
@@ -180,8 +181,7 @@
         l = l.strip()
         if not l:
             continue
-        # XXX: Does this always follow Python escape semantics?
-        l = eval(l)
+        l = ast.literal_eval(l)
         if section == ID:
             msgid += l.encode(encoding)
         elif section == STR:

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

From python-checkins at python.org  Fri Nov  9 16:54:55 2012
From: python-checkins at python.org (chris.withers)
Date: Fri,  9 Nov 2012 16:54:55 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQnVnICMxNjQ0MTog?=
 =?utf-8?q?avoid_excessive_memory_usage_working_with_large_gzip_files?=
Message-ID: <3XymCM3qSvzPmC@mail.python.org>

http://hg.python.org/cpython/rev/f938d478359a
changeset:   80328:f938d478359a
branch:      2.7
parent:      80324:058ff991bdcb
user:        Chris Withers <chris at simplistix.co.uk>
date:        Fri Nov 09 15:48:17 2012 +0000
summary:
  Bug #16441: avoid excessive memory usage working with large gzip files

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


diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -421,7 +421,7 @@
             if offset < self.offset:
                 raise IOError('Negative seek in write mode')
             count = offset - self.offset
-            for i in range(count // 1024):
+            for i in xrange(count // 1024):
                 self.write(1024 * '\0')
             self.write((count % 1024) * '\0')
         elif self.mode == READ:
@@ -429,7 +429,7 @@
                 # for negative seek, rewind and do positive seek
                 self.rewind()
             count = offset - self.offset
-            for i in range(count // 1024):
+            for i in xrange(count // 1024):
                 self.read(1024)
             self.read(count % 1024)
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -464,6 +464,9 @@
 - Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils
   on Windows.
 
+- Issue #16441: Avoid excessive memory usage working with large gzip
+  files using the gzip module.
+
 Extension Modules
 -----------------
 

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

From python-checkins at python.org  Sat Nov 10 02:56:23 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 02:56:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Improve_FAQ_li?=
 =?utf-8?q?nk_in_documentation_=28for_issue_=2316435=29=2E?=
Message-ID: <3Xz1YM2wSxzN1s@mail.python.org>

http://hg.python.org/cpython/rev/da0b3735be27
changeset:   80329:da0b3735be27
branch:      3.2
parent:      80325:2fa338374719
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 17:52:30 2012 -0800
summary:
  Improve FAQ link in documentation (for issue #16435).

files:
  Doc/faq/index.rst        |  2 ++
  Doc/tutorial/whatnow.rst |  5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
--- a/Doc/faq/index.rst
+++ b/Doc/faq/index.rst
@@ -1,3 +1,5 @@
+.. _faq-index:
+
 ###################################
   Python Frequently Asked Questions
 ###################################
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -59,9 +59,8 @@
 messages posted to one will automatically be forwarded to the other.  There are
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
-or look for it in the :file:`Misc/` directory of the Python source distribution.
+Before posting, be sure to check the list of :ref:`Frequently Asked Questions
+<faq-index>` (also called the FAQ).
 Mailing list archives are available at http://mail.python.org/pipermail/.
 The FAQ answers many of the questions that come up again and again,
 and may already contain the solution for your problem.

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

From python-checkins at python.org  Sat Nov 10 02:56:24 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 02:56:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_from_3=2E2=3A_improve_FAQ_link_in_documentation_=28for_i?=
 =?utf-8?q?ssue_=2316435=29=2E?=
Message-ID: <3Xz1YN5Z3kzPkD@mail.python.org>

http://hg.python.org/cpython/rev/3951264b0763
changeset:   80330:3951264b0763
branch:      3.3
parent:      80326:ea2cb9b69fd9
parent:      80329:da0b3735be27
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 17:53:14 2012 -0800
summary:
  Merge from 3.2: improve FAQ link in documentation (for issue #16435).

files:
  Doc/faq/index.rst        |  2 ++
  Doc/tutorial/whatnow.rst |  5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
--- a/Doc/faq/index.rst
+++ b/Doc/faq/index.rst
@@ -1,3 +1,5 @@
+.. _faq-index:
+
 ###################################
   Python Frequently Asked Questions
 ###################################
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -59,9 +59,8 @@
 messages posted to one will automatically be forwarded to the other.  There are
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
-or look for it in the :file:`Misc/` directory of the Python source distribution.
+Before posting, be sure to check the list of :ref:`Frequently Asked Questions
+<faq-index>` (also called the FAQ).
 Mailing list archives are available at http://mail.python.org/pipermail/.
 The FAQ answers many of the questions that come up again and again,
 and may already contain the solution for your problem.

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

From python-checkins at python.org  Sat Nov 10 02:56:26 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 02:56:26 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_improve_FAQ_link_in_documentation_?=
 =?utf-8?q?=28for_issue_=2316435=29=2E?=
Message-ID: <3Xz1YQ0pF7zPkT@mail.python.org>

http://hg.python.org/cpython/rev/7cfe8cd4d65e
changeset:   80331:7cfe8cd4d65e
parent:      80327:aa02f7be68f6
parent:      80330:3951264b0763
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 17:54:21 2012 -0800
summary:
  Merge from 3.3: improve FAQ link in documentation (for issue #16435).

files:
  Doc/faq/index.rst        |  2 ++
  Doc/tutorial/whatnow.rst |  5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
--- a/Doc/faq/index.rst
+++ b/Doc/faq/index.rst
@@ -1,3 +1,5 @@
+.. _faq-index:
+
 ###################################
   Python Frequently Asked Questions
 ###################################
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -59,9 +59,8 @@
 messages posted to one will automatically be forwarded to the other.  There are
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/3/doc/faq/>`_ (also called the FAQ),
-or look for it in the :file:`Misc/` directory of the Python source distribution.
+Before posting, be sure to check the list of :ref:`Frequently Asked Questions
+<faq-index>` (also called the FAQ).
 Mailing list archives are available at http://mail.python.org/pipermail/.
 The FAQ answers many of the questions that come up again and again,
 and may already contain the solution for your problem.

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

From python-checkins at python.org  Sat Nov 10 03:00:05 2012
From: python-checkins at python.org (daniel.holth)
Date: Sat, 10 Nov 2012 03:00:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP-376=3A_remove_hexdigest_f?=
	=?utf-8?q?rom_RECORD?=
Message-ID: <3Xz1dd6TVQzPbX@mail.python.org>

http://hg.python.org/peps/rev/29d806840ab8
changeset:   4581:29d806840ab8
user:        Daniel Holth <dholth at fastmail.fm>
date:        Fri Nov 09 20:58:41 2012 -0500
summary:
  PEP-376: remove hexdigest from RECORD

files:
  pep-0376.txt |  19 +++++++++----------
  1 files changed, 9 insertions(+), 10 deletions(-)


diff --git a/pep-0376.txt b/pep-0376.txt
--- a/pep-0376.txt
+++ b/pep-0376.txt
@@ -224,10 +224,9 @@
   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
+  The hash is either the empty string 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 
+  ``=``, followed by the urlsafe-base64-nopad encoding of the digest
   (``base64.urlsafe_b64encode(digest)`` with trailing ``=`` removed).
 
 - the file's size in bytes
@@ -243,27 +242,27 @@
 
 Here's an example of a RECORD file (extract)::
 
-    lib/python2.6/site-packages/docutils/__init__.py,b690274f621402dda63bf11ba5373bf2,9544
+    lib/python2.6/site-packages/docutils/__init__.py,md5=nWt-Dge1eug4iAgqLS_uWg,9544
     lib/python2.6/site-packages/docutils/__init__.pyc,,
-    lib/python2.6/site-packages/docutils/core.py,9c4b84aff68aa55f2e9bf70481b94333,66188
+    lib/python2.6/site-packages/docutils/core.py,md5=X90C_JLIcC78PL74iuhPnA,66188
     lib/python2.6/site-packages/docutils/core.pyc,,
-    lib/python2.6/site-packages/roman.py,a4b84aff68aa55f2e9bf70481b943D3,234
+    lib/python2.6/site-packages/roman.py,md5=7YhfNczihNjOY0FXlupwBg,234
     lib/python2.6/site-packages/roman.pyc,,
-    /usr/local/bin/rst2html.py,a4b84aff68aa55f2e9bf70481b943D3,234
+    /usr/local/bin/rst2html.py,md5=g22D3amDLJP-FhBzCi7EvA,234
     /usr/local/bin/rst2html.pyc,,
-    python2.6/site-packages/docutils-0.5.dist-info/METADATA,6fe57de576d749536082d8e205b77748,195
+    python2.6/site-packages/docutils-0.5.dist-info/METADATA,md5=ovJyUNzXdArGfmVyb0onyA,195
     lib/python2.6/site-packages/docutils-0.5.dist-info/RECORD,,
 
 Notice that the `RECORD` file can't contain a hash of itself and is just mentioned here
 
 A project that installs a `config.ini` file in `/etc/myapp` will be added like this::
 
-    /etc/myapp/config.ini,b690274f621402dda63bf11ba5373bf2,9544
+    /etc/myapp/config.ini,md5=gLfd6IANquzGLhOkW4Mfgg,9544
 
 For a windows platform, the drive letter is added for the absolute paths,
 so a file that is copied in c:\MyApp\ will be::
 
-    c:\etc\myapp\config.ini,b690274f621402dda63bf11ba5373bf2,9544
+    c:\etc\myapp\config.ini,md5=gLfd6IANquzGLhOkW4Mfgg,9544
 
 
 INSTALLER

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

From python-checkins at python.org  Sat Nov 10 03:00:07 2012
From: python-checkins at python.org (daniel.holth)
Date: Sat, 10 Nov 2012 03:00:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP-0426=3A_reword_Project-UR?=
	=?utf-8?q?L?=
Message-ID: <3Xz1dg1LLVzPbX@mail.python.org>

http://hg.python.org/peps/rev/4eb9b56fcfb6
changeset:   4582:4eb9b56fcfb6
user:        Daniel Holth <dholth at fastmail.fm>
date:        Fri Nov 09 20:59:17 2012 -0500
summary:
  PEP-0426: reword Project-URL

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


diff --git a/pep-0426.txt b/pep-0426.txt
--- a/pep-0426.txt
+++ b/pep-0426.txt
@@ -414,14 +414,14 @@
 Project-URL (multiple use)
 ::::::::::::::::::::::::::
 
-A string containing a browsable URL for the project and a label for it,
-separated by a comma.
+A string containing a label and a browsable URL for the project, separated
+by the last occurance of comma and space ", ".
 
 Example::
 
-    Bug Tracker, http://bitbucket.org/tarek/distribute/issues/
+    Bug, Issue Tracker, http://bitbucket.org/tarek/distribute/issues/
 
-The label is a free text limited to 32 signs.
+The label is a free text.
 
 
 Provides-Extra (multiple use)
@@ -606,14 +606,15 @@
 
 * Changed fields:
 
+  - Description
+  - Project-URL
   - Requires-Dist
-  - Description
 
 * Added fields:
 
+  - Extension
+  - Provides-Extra
   - Setup-Requires-Dist
-  - Provides-Extra
-  - Extension    
   
 References
 ==========

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

From python-checkins at python.org  Sat Nov 10 03:02:36 2012
From: python-checkins at python.org (daniel.holth)
Date: Sat, 10 Nov 2012 03:02:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_spelling?=
Message-ID: <3Xz1hX0bvRzPbX@mail.python.org>

http://hg.python.org/peps/rev/62651b5f1fa9
changeset:   4583:62651b5f1fa9
user:        Daniel Holth <dholth at fastmail.fm>
date:        Fri Nov 09 21:02:28 2012 -0500
summary:
  spelling

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


diff --git a/pep-0426.txt b/pep-0426.txt
--- a/pep-0426.txt
+++ b/pep-0426.txt
@@ -415,7 +415,7 @@
 ::::::::::::::::::::::::::
 
 A string containing a label and a browsable URL for the project, separated
-by the last occurance of comma and space ", ".
+by the last occurence of comma and space ", ".
 
 Example::
 

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

From python-checkins at python.org  Sat Nov 10 03:03:20 2012
From: python-checkins at python.org (daniel.holth)
Date: Sat, 10 Nov 2012 03:03:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_spelling?=
Message-ID: <3Xz1jN6kzLzPp5@mail.python.org>

http://hg.python.org/peps/rev/3e3f23107bde
changeset:   4584:3e3f23107bde
user:        Daniel Holth <dholth at fastmail.fm>
date:        Fri Nov 09 21:03:14 2012 -0500
summary:
  spelling

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


diff --git a/pep-0426.txt b/pep-0426.txt
--- a/pep-0426.txt
+++ b/pep-0426.txt
@@ -415,7 +415,7 @@
 ::::::::::::::::::::::::::
 
 A string containing a label and a browsable URL for the project, separated
-by the last occurence of comma and space ", ".
+by the last occurrence of comma and space ", ".
 
 Example::
 

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

From python-checkins at python.org  Sat Nov 10 03:04:48 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 03:04:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?=
 =?utf-8?q?3=2E2=3A_improve_FAQ_link_in_documentation_=28for_issue_=231643?=
 =?utf-8?b?NSku?=
Message-ID: <3Xz1l403tGzPtM@mail.python.org>

http://hg.python.org/cpython/rev/5b3648f5e452
changeset:   80332:5b3648f5e452
branch:      2.7
parent:      80328:f938d478359a
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 18:04:00 2012 -0800
summary:
  Backport from 3.2: improve FAQ link in documentation (for issue #16435).

files:
  Doc/faq/index.rst        |  2 ++
  Doc/tutorial/whatnow.rst |  5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
--- a/Doc/faq/index.rst
+++ b/Doc/faq/index.rst
@@ -1,3 +1,5 @@
+.. _faq-index:
+
 ###################################
   Python Frequently Asked Questions
 ###################################
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -54,9 +54,8 @@
 messages posted to one will automatically be forwarded to the other.  There are
 around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of `Frequently Asked Questions
-<http://www.python.org/doc/faq/>`_ (also called the FAQ), or look for it in the
-:file:`Misc/` directory of the Python source distribution.  Mailing list
+Before posting, be sure to check the list of :ref:`Frequently Asked Questions
+<faq-index>` (also called the FAQ).  Mailing list
 archives are available at http://mail.python.org/pipermail/. The FAQ answers
 many of the questions that come up again and again, and may already contain the
 solution for your problem.

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

From python-checkins at python.org  Sat Nov 10 04:02:35 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 04:02:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Link_set_and_f?=
 =?utf-8?q?rozenset_function_docs_to_their_class_definitions_=28issue_=231?=
 =?utf-8?b?NjQzNiku?=
Message-ID: <3Xz31l1bMkzMy3@mail.python.org>

http://hg.python.org/cpython/rev/16fa6462dfe1
changeset:   80333:16fa6462dfe1
branch:      3.2
parent:      80329:da0b3735be27
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 18:57:32 2012 -0800
summary:
  Link set and frozenset function docs to their class definitions (issue #16436).

files:
  Doc/library/functions.rst |  19 +++++++++++++------
  1 files changed, 13 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
@@ -541,11 +541,13 @@
 .. function:: frozenset([iterable])
    :noindex:
 
-   Return a frozenset object, optionally with elements taken from *iterable*.
-   The frozenset type is described in :ref:`types-set`.
+   Return a new :class:`frozenset` object, optionally with elements taken from
+   *iterable*.  ``frozenset`` is a built-in class.  See :class:`frozenset` and
+   :ref:`types-set` for documentation about this class.
 
-   For other containers see the built in :class:`dict`, :class:`list`, and
-   :class:`tuple` classes, and the :mod:`collections` module.
+   For other containers see the built-in :class:`set`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
 
 .. function:: getattr(object, name[, default])
@@ -1167,8 +1169,13 @@
 .. function:: set([iterable])
    :noindex:
 
-   Return a new set, optionally with elements taken from *iterable*.
-   The set type is described in :ref:`types-set`.
+   Return a new :class:`set` object, optionally with elements taken from
+   *iterable*.  ``set`` is a built-in class.  See :class:`set` and
+   :ref:`types-set` for documentation about this class.
+
+   For other containers see the built-in :class:`frozenset`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
 
 .. function:: setattr(object, name, value)

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

From python-checkins at python.org  Sat Nov 10 04:02:36 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 04:02:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_from_3=2E2=3A_adjust_set_and_frozenset_function_docs_=28?=
 =?utf-8?q?issue_=2316436=29=2E?=
Message-ID: <3Xz31m41xzzNgn@mail.python.org>

http://hg.python.org/cpython/rev/d534da27ca8b
changeset:   80334:d534da27ca8b
branch:      3.3
parent:      80330:3951264b0763
parent:      80333:16fa6462dfe1
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 18:58:06 2012 -0800
summary:
  Merge from 3.2: adjust set and frozenset function docs (issue #16436).

files:
  Doc/library/functions.rst |  19 +++++++++++++------
  1 files changed, 13 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
@@ -547,11 +547,13 @@
 .. function:: frozenset([iterable])
    :noindex:
 
-   Return a frozenset object, optionally with elements taken from *iterable*.
-   The frozenset type is described in :ref:`types-set`.
+   Return a new :class:`frozenset` object, optionally with elements taken from
+   *iterable*.  ``frozenset`` is a built-in class.  See :class:`frozenset` and
+   :ref:`types-set` for documentation about this class.
 
-   For other containers see the built in :class:`dict`, :class:`list`, and
-   :class:`tuple` classes, and the :mod:`collections` module.
+   For other containers see the built-in :class:`set`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
 
 .. function:: getattr(object, name[, default])
@@ -1170,8 +1172,13 @@
 .. function:: set([iterable])
    :noindex:
 
-   Return a new set, optionally with elements taken from *iterable*.
-   The set type is described in :ref:`types-set`.
+   Return a new :class:`set` object, optionally with elements taken from
+   *iterable*.  ``set`` is a built-in class.  See :class:`set` and
+   :ref:`types-set` for documentation about this class.
+
+   For other containers see the built-in :class:`frozenset`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
 
 .. function:: setattr(object, name, value)

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

From python-checkins at python.org  Sat Nov 10 04:02:37 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 04:02:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_adjust_set_and_frozenset_function_do?=
 =?utf-8?b?Y3MgKGlzc3VlICMxNjQzNiku?=
Message-ID: <3Xz31n6cgBzPvd@mail.python.org>

http://hg.python.org/cpython/rev/1fde0d70f2b8
changeset:   80335:1fde0d70f2b8
parent:      80331:7cfe8cd4d65e
parent:      80334:d534da27ca8b
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 18:58:47 2012 -0800
summary:
  Merge from 3.3: adjust set and frozenset function docs (issue #16436).

files:
  Doc/library/functions.rst |  19 +++++++++++++------
  1 files changed, 13 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
@@ -547,11 +547,13 @@
 .. function:: frozenset([iterable])
    :noindex:
 
-   Return a frozenset object, optionally with elements taken from *iterable*.
-   The frozenset type is described in :ref:`types-set`.
+   Return a new :class:`frozenset` object, optionally with elements taken from
+   *iterable*.  ``frozenset`` is a built-in class.  See :class:`frozenset` and
+   :ref:`types-set` for documentation about this class.
 
-   For other containers see the built in :class:`dict`, :class:`list`, and
-   :class:`tuple` classes, and the :mod:`collections` module.
+   For other containers see the built-in :class:`set`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
 
 .. function:: getattr(object, name[, default])
@@ -1170,8 +1172,13 @@
 .. function:: set([iterable])
    :noindex:
 
-   Return a new set, optionally with elements taken from *iterable*.
-   The set type is described in :ref:`types-set`.
+   Return a new :class:`set` object, optionally with elements taken from
+   *iterable*.  ``set`` is a built-in class.  See :class:`set` and
+   :ref:`types-set` for documentation about this class.
+
+   For other containers see the built-in :class:`frozenset`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
 
 .. function:: setattr(object, name, value)

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

From python-checkins at python.org  Sat Nov 10 04:13:21 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 10 Nov 2012 04:13:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?=
 =?utf-8?q?3=2E2=3A_adjust_set_and_frozenset_function_docs_=28issue_=23164?=
 =?utf-8?q?36=29=2E?=
Message-ID: <3Xz3G90rXdzN42@mail.python.org>

http://hg.python.org/cpython/rev/24db5292c2c9
changeset:   80336:24db5292c2c9
branch:      2.7
parent:      80332:5b3648f5e452
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 09 19:12:02 2012 -0800
summary:
  Backport from 3.2: adjust set and frozenset function docs (issue #16436).

files:
  Doc/library/functions.rst |  20 ++++++++++++--------
  1 files changed, 12 insertions(+), 8 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -533,11 +533,13 @@
 .. function:: frozenset([iterable])
    :noindex:
 
-   Return a frozenset object, optionally with elements taken from *iterable*.
-   The frozenset type is described in :ref:`types-set`.
+   Return a new :class:`frozenset` object, optionally with elements taken from
+   *iterable*.  ``frozenset`` is a built-in class.  See :class:`frozenset` and
+   :ref:`types-set` for documentation about this class.
 
-   For other containers see the built in :class:`dict`, :class:`list`, and
-   :class:`tuple` classes, and the :mod:`collections` module.
+   For other containers see the built-in :class:`set`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
    .. versionadded:: 2.4
 
@@ -1225,11 +1227,13 @@
 .. function:: set([iterable])
    :noindex:
 
-   Return a new set, optionally with elements taken from *iterable*.
-   The set type is described in :ref:`types-set`.
+   Return a new :class:`set` object, optionally with elements taken from
+   *iterable*.  ``set`` is a built-in class.  See :class:`set` and
+   :ref:`types-set` for documentation about this class.
 
-   For other containers see the built in :class:`dict`, :class:`list`, and
-   :class:`tuple` classes, and the :mod:`collections` module.
+   For other containers see the built-in :class:`frozenset`, :class:`list`,
+   :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+   module.
 
    .. versionadded:: 2.4
 

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

From solipsis at pitrou.net  Sat Nov 10 05:56:36 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 10 Nov 2012 05:56:36 +0100
Subject: [Python-checkins] Daily reference leaks (7cfe8cd4d65e): sum=0
Message-ID: <E1TX37U-0007RZ-M1@ap.vmr.nerim.net>

results for 7cfe8cd4d65e on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Sat Nov 10 12:07:37 2012
From: python-checkins at python.org (victor.stinner)
Date: Sat, 10 Nov 2012 12:07:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316444=2C_=2316218?=
 =?utf-8?q?=3A_Use_TESTFN=5FUNDECODABLE_on_UNIX?=
Message-ID: <3XzFnP037RzPpg@mail.python.org>

http://hg.python.org/cpython/rev/6b8a8bc6ba9c
changeset:   80337:6b8a8bc6ba9c
parent:      80335:1fde0d70f2b8
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sat Nov 10 12:07:39 2012 +0100
summary:
  Issue #16444, #16218: Use TESTFN_UNDECODABLE on UNIX

Check if data is decoded by os.fsdecode() (filesystem encoding with
surrogateescape error handler, PEP 383), not by UTF-8 or the filesystem
encoding in strict mode.

Use TESTFN_UNDECODABLE in test_cmd_line_script.test_non_ascii() on UNIX.

files:
  Lib/test/support.py              |  28 +++++++++++++-----
  Lib/test/test_cmd_line_script.py |  14 ++++++++-
  Lib/test/test_genericpath.py     |  29 ++++++-------------
  3 files changed, 42 insertions(+), 29 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -692,17 +692,29 @@
 
 # TESTFN_UNDECODABLE is a filename (bytes type) that should *not* be able to be
 # decoded from the filesystem encoding (in strict mode). It can be None if we
-# cannot generate such filename.
+# cannot generate such filename (ex: the latin1 encoding can decode any byte
+# sequence). On UNIX, TESTFN_UNDECODABLE can be decoded by os.fsdecode() thanks
+# to the surrogateescape error handler (PEP 383), but not from the filesystem
+# encoding in strict mode.
 TESTFN_UNDECODABLE = None
-# b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
-# accepts it to create a file or a directory, or don't accept to enter to
-# such directory (when the bytes name is used). So test b'\xe7' first: it is
-# not decodable from cp932.
-for name in (b'\xe7w\xf0', b'abc\xff'):
+for name in (
+    # b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
+    # accepts it to create a file or a directory, or don't accept to enter to
+    # such directory (when the bytes name is used). So test b'\xe7' first: it is
+    # not decodable from cp932.
+    b'\xe7w\xf0',
+    # undecodable from ASCII, UTF-8
+    b'\xff',
+    # undecodable from iso8859-3, iso8859-6, iso8859-7, cp424, iso8859-8, cp856
+    # and cp857
+    b'\xae\xd5'
+    # undecodable from UTF-8 (UNIX and Mac OS X)
+    b'\xed\xb2\x80', b'\xed\xb4\x80',
+):
     try:
-        os.fsdecode(name)
+        name.decode(TESTFN_ENCODING)
     except UnicodeDecodeError:
-        TESTFN_UNDECODABLE = name
+        TESTFN_UNDECODABLE = os.fsencode(TESTFN) + name
         break
 
 if FS_NONASCII:
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,11 +363,21 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
-    @unittest.skipUnless(support.TESTFN_NONASCII, 'need support.TESTFN_NONASCII')
     def test_non_ascii(self):
+        # Mac OS X denies the creation of a file with an invalid UTF-8 name.
+        # Windows allows to create a name with an arbitrary bytes name, but
+        # Python cannot a undecodable bytes argument to a subprocess.
+        if (support.TESTFN_UNDECODABLE
+        and sys.platform not in ('win32', 'darwin')):
+            name = os.fsdecode(support.TESTFN_UNDECODABLE)
+        elif support.TESTFN_NONASCII:
+            name = support.TESTFN_NONASCII
+        else:
+            self.skipTest("need support.TESTFN_NONASCII")
+
         # Issue #16218
         source = 'print(ascii(__file__))\n'
-        script_name = _make_test_script(os.curdir, support.TESTFN_NONASCII, source)
+        script_name = _make_test_script(os.curdir, name, source)
         self.addCleanup(support.unlink, script_name)
         rc, stdout, stderr = assert_python_ok(script_name)
         self.assertEqual(
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -309,26 +309,17 @@
                     self.assertIsInstance(abspath(path), str)
 
     def test_nonascii_abspath(self):
-        # Test non-ASCII in the path
-        if sys.platform in ('win32', 'darwin'):
-            if support.TESTFN_NONASCII:
-                name = support.TESTFN_NONASCII
-            else:
-                # Mac OS X denies the creation of a directory with an invalid
-                # UTF-8 name. Windows allows to create a directory with an
-                # arbitrary bytes name, but fails to enter this directory
-                # (when the bytes name is used).
-                self.skipTest("need support.TESTFN_NONASCII")
+        if (support.TESTFN_UNDECODABLE
+        # Mac OS X denies the creation of a directory with an invalid
+        # UTF-8 name. Windows allows to create a directory with an
+        # arbitrary bytes name, but fails to enter this directory
+        # (when the bytes name is used).
+        and sys.platform not in ('win32', 'darwin')):
+            name = support.TESTFN_UNDECODABLE
+        elif support.TESTFN_NONASCII:
+            name = support.TESTFN_NONASCII
         else:
-            if support.TESTFN_UNDECODABLE:
-                name = support.TESTFN_UNDECODABLE
-            elif support.TESTFN_NONASCII:
-                name = support.TESTFN_NONASCII
-            else:
-                # On UNIX, the surrogateescape error handler is used to
-                # decode paths, so any byte is allowed, it does not depend
-                # on the locale
-                name = b'a\xffb\xe7w\xf0'
+            self.skipTest("need support.TESTFN_NONASCII")
 
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)

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

From python-checkins at python.org  Sat Nov 10 15:52:27 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sat, 10 Nov 2012 15:52:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2314794=3A_slice=2E?=
 =?utf-8?q?indices_no_longer_returns_OverflowError_for_out-of-range?=
Message-ID: <3XzLmq1QJTzPkD@mail.python.org>

http://hg.python.org/cpython/rev/9214f8440c44
changeset:   80338:9214f8440c44
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Nov 10 14:52:10 2012 +0000
summary:
  Issue #14794: slice.indices no longer returns OverflowError for out-of-range start, stop, step or length.

files:
  Lib/test/test_slice.py |  114 +++++++++++++++++-
  Misc/NEWS              |    3 +
  Objects/sliceobject.c  |  183 +++++++++++++++++++++++++++-
  3 files changed, 291 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_slice.py b/Lib/test/test_slice.py
--- a/Lib/test/test_slice.py
+++ b/Lib/test/test_slice.py
@@ -4,8 +4,70 @@
 from test import support
 from pickle import loads, dumps
 
+import itertools
+import operator
 import sys
 
+
+def evaluate_slice_index(arg):
+    """
+    Helper function to convert a slice argument to an integer, and raise
+    TypeError with a suitable message on failure.
+
+    """
+    if hasattr(arg, '__index__'):
+        return operator.index(arg)
+    else:
+        raise TypeError(
+            "slice indices must be integers or "
+            "None or have an __index__ method")
+
+def slice_indices(slice, length):
+    """
+    Reference implementation for the slice.indices method.
+
+    """
+    # Compute step and length as integers.
+    length = operator.index(length)
+    step = 1 if slice.step is None else evaluate_slice_index(slice.step)
+
+    # Raise ValueError for negative length or zero step.
+    if length < 0:
+        raise ValueError("length should not be negative")
+    if step == 0:
+        raise ValueError("slice step cannot be zero")
+
+    # Find lower and upper bounds for start and stop.
+    lower = -1 if step < 0 else 0
+    upper = length - 1 if step < 0 else length
+
+    # Compute start.
+    if slice.start is None:
+        start = upper if step < 0 else lower
+    else:
+        start = evaluate_slice_index(slice.start)
+        start = max(start + length, lower) if start < 0 else min(start, upper)
+
+    # Compute stop.
+    if slice.stop is None:
+        stop = lower if step < 0 else upper
+    else:
+        stop = evaluate_slice_index(slice.stop)
+        stop = max(stop + length, lower) if stop < 0 else min(stop, upper)
+
+    return start, stop, step
+
+
+# Class providing an __index__ method.  Used for testing slice.indices.
+
+class MyIndexable(object):
+    def __init__(self, value):
+        self.value = value
+
+    def __index__(self):
+        return self.value
+
+
 class SliceTest(unittest.TestCase):
 
     def test_constructor(self):
@@ -75,6 +137,22 @@
         s = slice(obj)
         self.assertTrue(s.stop is obj)
 
+    def check_indices(self, slice, length):
+        try:
+            actual = slice.indices(length)
+        except ValueError:
+            actual = "valueerror"
+        try:
+            expected = slice_indices(slice, length)
+        except ValueError:
+            expected = "valueerror"
+        self.assertEqual(actual, expected)
+
+        if length >= 0 and slice.step != 0:
+            actual = range(*slice.indices(length))
+            expected = range(length)[slice]
+            self.assertEqual(actual, expected)
+
     def test_indices(self):
         self.assertEqual(slice(None           ).indices(10), (0, 10,  1))
         self.assertEqual(slice(None,  None,  2).indices(10), (0, 10,  2))
@@ -108,7 +186,41 @@
 
         self.assertEqual(list(range(10))[::sys.maxsize - 1], [0])
 
-        self.assertRaises(OverflowError, slice(None).indices, 1<<100)
+        # Check a variety of start, stop, step and length values, including
+        # values exceeding sys.maxsize (see issue #14794).
+        vals = [None, -2**100, -2**30, -53, -7, -1, 0, 1, 7, 53, 2**30, 2**100]
+        lengths = [0, 1, 7, 53, 2**30, 2**100]
+        for slice_args in itertools.product(vals, repeat=3):
+            s = slice(*slice_args)
+            for length in lengths:
+                self.check_indices(s, length)
+        self.check_indices(slice(0, 10, 1), -3)
+
+        # Negative length should raise ValueError
+        with self.assertRaises(ValueError):
+            slice(None).indices(-1)
+
+        # Zero step should raise ValueError
+        with self.assertRaises(ValueError):
+            slice(0, 10, 0).indices(5)
+
+        # Using a start, stop or step or length that can't be interpreted as an
+        # integer should give a TypeError ...
+        with self.assertRaises(TypeError):
+            slice(0.0, 10, 1).indices(5)
+        with self.assertRaises(TypeError):
+            slice(0, 10.0, 1).indices(5)
+        with self.assertRaises(TypeError):
+            slice(0, 10, 1.0).indices(5)
+        with self.assertRaises(TypeError):
+            slice(0, 10, 1).indices(5.0)
+
+        # ... but it should be fine to use a custom class that provides index.
+        self.assertEqual(slice(0, 10, 1).indices(5), (0, 5, 1))
+        self.assertEqual(slice(MyIndexable(0), 10, 1).indices(5), (0, 5, 1))
+        self.assertEqual(slice(0, MyIndexable(10), 1).indices(5), (0, 5, 1))
+        self.assertEqual(slice(0, 10, MyIndexable(1)).indices(5), (0, 5, 1))
+        self.assertEqual(slice(0, 10, 1).indices(MyIndexable(5)), (0, 5, 1))
 
     def test_setslice_without_getslice(self):
         tmp = []
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #14794: Fix slice.indices to return correct results for huge values,
+  rather than raising OverflowError.
+
 - Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
   Stinner.
 
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -299,25 +299,192 @@
     {0}
 };
 
+/* Helper function to convert a slice argument to a PyLong, and raise TypeError
+   with a suitable message on failure. */
+
+static PyObject*
+evaluate_slice_index(PyObject *v)
+{
+    if (PyIndex_Check(v)) {
+        return PyNumber_Index(v);
+    }
+    else {
+        PyErr_SetString(PyExc_TypeError,
+                        "slice indices must be integers or "
+                        "None or have an __index__ method");
+        return NULL;
+    }
+}
+
+/* Implementation of slice.indices. */
+
 static PyObject*
 slice_indices(PySliceObject* self, PyObject* len)
 {
-    Py_ssize_t ilen, start, stop, step, slicelength;
+    PyObject *start=NULL, *stop=NULL, *step=NULL;
+    PyObject *length=NULL, *upper=NULL, *lower=NULL, *zero=NULL;
+    int step_is_negative, cmp;
 
-    ilen = PyNumber_AsSsize_t(len, PyExc_OverflowError);
+    zero = PyLong_FromLong(0L);
+    if (zero == NULL)
+        return NULL;
 
-    if (ilen == -1 && PyErr_Occurred()) {
-        return NULL;
+    /* Compute step and length as integers. */
+    length = PyNumber_Index(len);
+    if (length == NULL)
+        goto error;
+
+    if (self->step == Py_None)
+        step = PyLong_FromLong(1L);
+    else
+        step = evaluate_slice_index(self->step);
+    if (step == NULL)
+        goto error;
+
+    /* Raise ValueError for negative length or zero step. */
+    cmp = PyObject_RichCompareBool(length, zero, Py_LT);
+    if (cmp < 0) {
+        goto error;
+    }
+    if (cmp) {
+        PyErr_SetString(PyExc_ValueError,
+                        "length should not be negative");
+        goto error;
     }
 
-    if (PySlice_GetIndicesEx((PyObject*)self, ilen, &start, &stop,
-                             &step, &slicelength) < 0) {
-        return NULL;
+    cmp = PyObject_RichCompareBool(step, zero, Py_EQ);
+    if (cmp < 0) {
+        goto error;
+    }
+    if (cmp) {
+        PyErr_SetString(PyExc_ValueError,
+                        "slice step cannot be zero");
+        goto error;
     }
 
-    return Py_BuildValue("(nnn)", start, stop, step);
+    /* Find lower and upper bounds for start and stop. */
+    step_is_negative = PyObject_RichCompareBool(step, zero, Py_LT);
+    if (step_is_negative < 0) {
+        goto error;
+    }
+    if (step_is_negative) {
+        lower = PyLong_FromLong(-1L);
+        if (lower == NULL)
+            goto error;
+
+        upper = PyNumber_Add(length, lower);
+        if (upper == NULL)
+            goto error;
+    }
+    else {
+        lower = zero;
+        Py_INCREF(lower);
+        upper = length;
+        Py_INCREF(upper);
+    }
+
+    /* Compute start. */
+    if (self->start == Py_None) {
+        start = step_is_negative ? upper : lower;
+        Py_INCREF(start);
+    }
+    else {
+        start = evaluate_slice_index(self->start);
+        if (start == NULL)
+            goto error;
+
+        cmp = PyObject_RichCompareBool(start, zero, Py_LT);
+        if (cmp < 0)
+            goto error;
+        if (cmp) {
+            /* start += length */
+            PyObject *tmp = PyNumber_Add(start, length);
+            Py_DECREF(start);
+            start = tmp;
+            if (start == NULL)
+                goto error;
+
+            cmp = PyObject_RichCompareBool(start, lower, Py_LT);
+            if (cmp < 0)
+                goto error;
+            if (cmp) {
+                Py_INCREF(lower);
+                Py_DECREF(start);
+                start = lower;
+            }
+        }
+        else {
+            cmp = PyObject_RichCompareBool(start, upper, Py_GT);
+            if (cmp < 0)
+                goto error;
+            if (cmp) {
+                Py_INCREF(upper);
+                Py_DECREF(start);
+                start = upper;
+            }
+        }
+    }
+
+    /* Compute stop. */
+    if (self->stop == Py_None) {
+        stop = step_is_negative ? lower : upper;
+        Py_INCREF(stop);
+    }
+    else {
+        stop = evaluate_slice_index(self->stop);
+        if (stop == NULL)
+            goto error;
+
+        cmp = PyObject_RichCompareBool(stop, zero, Py_LT);
+        if (cmp < 0)
+            goto error;
+        if (cmp) {
+            /* stop += length */
+            PyObject *tmp = PyNumber_Add(stop, length);
+            Py_DECREF(stop);
+            stop = tmp;
+            if (stop == NULL)
+                goto error;
+
+            cmp = PyObject_RichCompareBool(stop, lower, Py_LT);
+            if (cmp < 0)
+                goto error;
+            if (cmp) {
+                Py_INCREF(lower);
+                Py_DECREF(stop);
+                stop = lower;
+            }
+        }
+        else {
+            cmp = PyObject_RichCompareBool(stop, upper, Py_GT);
+            if (cmp < 0)
+                goto error;
+            if (cmp) {
+                Py_INCREF(upper);
+                Py_DECREF(stop);
+                stop = upper;
+            }
+        }
+    }
+
+    Py_DECREF(upper);
+    Py_DECREF(lower);
+    Py_DECREF(length);
+    Py_DECREF(zero);
+    return Py_BuildValue("(NNN)", start, stop, step);
+
+  error:
+    Py_XDECREF(start);
+    Py_XDECREF(stop);
+    Py_XDECREF(step);
+    Py_XDECREF(upper);
+    Py_XDECREF(lower);
+    Py_XDECREF(length);
+    Py_XDECREF(zero);
+    return NULL;
 }
 
+
 PyDoc_STRVAR(slice_indices_doc,
 "S.indices(len) -> (start, stop, stride)\n\
 \n\

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

From python-checkins at python.org  Sat Nov 10 22:31:50 2012
From: python-checkins at python.org (victor.stinner)
Date: Sat, 10 Nov 2012 22:31:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316444=3A_disable_?=
 =?utf-8?q?undecodable_characters_in_test=5Fnon=5Fascii=28=29_test_until?=
Message-ID: <3XzWdf3DZHzPk9@mail.python.org>

http://hg.python.org/cpython/rev/398f8770bf0d
changeset:   80339:398f8770bf0d
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sat Nov 10 22:32:08 2012 +0100
summary:
  Issue #16444: disable undecodable characters in test_non_ascii() test until
the FreeBSD issue is fixed

files:
  Lib/test/test_cmd_line_script.py |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -367,10 +367,11 @@
         # Mac OS X denies the creation of a file with an invalid UTF-8 name.
         # Windows allows to create a name with an arbitrary bytes name, but
         # Python cannot a undecodable bytes argument to a subprocess.
-        if (support.TESTFN_UNDECODABLE
-        and sys.platform not in ('win32', 'darwin')):
-            name = os.fsdecode(support.TESTFN_UNDECODABLE)
-        elif support.TESTFN_NONASCII:
+        #if (support.TESTFN_UNDECODABLE
+        #and sys.platform not in ('win32', 'darwin')):
+        #    name = os.fsdecode(support.TESTFN_UNDECODABLE)
+        #elif support.TESTFN_NONASCII:
+        if support.TESTFN_NONASCII:
             name = support.TESTFN_NONASCII
         else:
             self.skipTest("need support.TESTFN_NONASCII")

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

From python-checkins at python.org  Sat Nov 10 22:44:57 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 10 Nov 2012 22:44:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fixes_issue_?=
 =?utf-8?q?=2316409=3A_The_reporthook_callback_made_by_the_legacy?=
Message-ID: <3XzWwn6mQLzPpY@mail.python.org>

http://hg.python.org/cpython/rev/19e6e32db5ec
changeset:   80340:19e6e32db5ec
branch:      3.3
parent:      80334:d534da27ca8b
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 13:43:44 2012 -0800
summary:
  Fixes issue #16409: The reporthook callback made by the legacy
urllib.request.urlretrieve API now properly supplies a constant
non-zero block_size as it did in Python 3.2 and 2.7.  This matches the
behavior of urllib.request.URLopener.retrieve.

files:
  Doc/library/urllib.request.rst |   3 +-
  Lib/test/test_urllibnet.py     |  34 +++++++++++++++++++--
  Lib/urllib/request.py          |   4 +-
  Misc/NEWS                      |   5 +++
  4 files changed, 39 insertions(+), 7 deletions(-)


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1305,7 +1305,8 @@
        *filename* is not given, the filename is the output of :func:`tempfile.mktemp`
        with a suffix that matches the suffix of the last path component of the input
        URL.  If *reporthook* is given, it must be a function accepting three numeric
-       parameters.  It will be called after each chunk of data is read from the
+       parameters: A chunk number, the maximum size chunks are read in and the total size of the download
+       (-1 if unknown).  It will be called once at the start and after each chunk of data is read from the
        network.  *reporthook* is ignored for local URLs.
 
        If the *url* uses the :file:`http:` scheme identifier, the optional *data*
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -137,10 +137,10 @@
     """Tests urllib.request.urlretrieve using the network."""
 
     @contextlib.contextmanager
-    def urlretrieve(self, *args):
+    def urlretrieve(self, *args, **kwargs):
         resource = args[0]
         with support.transient_internet(resource):
-            file_location, info = urllib.request.urlretrieve(*args)
+            file_location, info = urllib.request.urlretrieve(*args, **kwargs)
             try:
                 yield file_location, info
             finally:
@@ -170,9 +170,10 @@
             self.assertIsInstance(info, email.message.Message,
                                   "info is not an instance of email.message.Message")
 
+    logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
+
     def test_data_header(self):
-        logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
-        with self.urlretrieve(logo) as (file_location, fileheaders):
+        with self.urlretrieve(self.logo) as (file_location, fileheaders):
             datevalue = fileheaders.get('Date')
             dateformat = '%a, %d %b %Y %H:%M:%S GMT'
             try:
@@ -180,6 +181,31 @@
             except ValueError:
                 self.fail('Date value not in %r format', dateformat)
 
+    def test_reporthook(self):
+        records = []
+        def recording_reporthook(blocks, block_size, total_size):
+            records.append((blocks, block_size, total_size))
+
+        with self.urlretrieve(self.logo, reporthook=recording_reporthook) as (
+                file_location, fileheaders):
+            expected_size = int(fileheaders['Content-Length'])
+
+        records_repr = repr(records)  # For use in error messages.
+        self.assertGreater(len(records), 1, msg="There should always be two "
+                           "calls; the first one before the transfer starts.")
+        self.assertEqual(records[0][0], 0)
+        self.assertGreater(records[0][1], 0,
+                           msg="block size can't be 0 in %s" % records_repr)
+        self.assertEqual(records[0][2], expected_size)
+        self.assertEqual(records[-1][2], expected_size)
+
+        block_sizes = {block_size for _, block_size, _ in records}
+        self.assertEqual({records[0][1]}, block_sizes,
+                         msg="block sizes in %s must be equal" % records_repr)
+        self.assertGreaterEqual(records[-1][0]*records[0][1], expected_size,
+                                msg="number of blocks * block size must be"
+                                " >= total size in %s" % records_repr)
+
 
 def test_main():
     support.requires('network')
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -208,7 +208,7 @@
                 size = int(headers["Content-Length"])
 
             if reporthook:
-                reporthook(blocknum, 0, size)
+                reporthook(blocknum, bs, size)
 
             while True:
                 block = fp.read(bs)
@@ -218,7 +218,7 @@
                 tfp.write(block)
                 blocknum += 1
                 if reporthook:
-                    reporthook(blocknum, len(block), size)
+                    reporthook(blocknum, bs, size)
 
     if size >= 0 and read < size:
         raise ContentTooShortError(
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,11 @@
 Library
 -------
 
+- Issue #16409: The reporthook callback made by the legacy
+  urllib.request.urlretrieve API now properly supplies a constant non-zero
+  block_size as it did in Python 3.2 and 2.7.  This matches the behavior of
+  urllib.request.URLopener.retrieve.
+
 - Issue #16431: Use the type information when constructing a Decimal subtype
   from a Decimal argument.
 

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

From python-checkins at python.org  Sat Nov 10 22:44:59 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 10 Nov 2012 22:44:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fixes_issue_=2316409=3A_The_reporthook_callback_made_by_?=
 =?utf-8?q?the_legacy?=
Message-ID: <3XzWwq3HNVzPt0@mail.python.org>

http://hg.python.org/cpython/rev/8c48eb0239ca
changeset:   80341:8c48eb0239ca
parent:      80339:398f8770bf0d
parent:      80340:19e6e32db5ec
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 13:44:50 2012 -0800
summary:
  Fixes issue #16409: The reporthook callback made by the legacy
urllib.request.urlretrieve API now properly supplies a constant
non-zero block_size as it did in Python 3.2 and 2.7.  This matches the
behavior of urllib.request.URLopener.retrieve.

files:
  Doc/library/urllib.request.rst |   3 +-
  Lib/test/test_urllibnet.py     |  34 +++++++++++++++++++--
  Lib/urllib/request.py          |   4 +-
  Misc/NEWS                      |   5 +++
  4 files changed, 39 insertions(+), 7 deletions(-)


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1305,7 +1305,8 @@
        *filename* is not given, the filename is the output of :func:`tempfile.mktemp`
        with a suffix that matches the suffix of the last path component of the input
        URL.  If *reporthook* is given, it must be a function accepting three numeric
-       parameters.  It will be called after each chunk of data is read from the
+       parameters: A chunk number, the maximum size chunks are read in and the total size of the download
+       (-1 if unknown).  It will be called once at the start and after each chunk of data is read from the
        network.  *reporthook* is ignored for local URLs.
 
        If the *url* uses the :file:`http:` scheme identifier, the optional *data*
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -137,10 +137,10 @@
     """Tests urllib.request.urlretrieve using the network."""
 
     @contextlib.contextmanager
-    def urlretrieve(self, *args):
+    def urlretrieve(self, *args, **kwargs):
         resource = args[0]
         with support.transient_internet(resource):
-            file_location, info = urllib.request.urlretrieve(*args)
+            file_location, info = urllib.request.urlretrieve(*args, **kwargs)
             try:
                 yield file_location, info
             finally:
@@ -170,9 +170,10 @@
             self.assertIsInstance(info, email.message.Message,
                                   "info is not an instance of email.message.Message")
 
+    logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
+
     def test_data_header(self):
-        logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
-        with self.urlretrieve(logo) as (file_location, fileheaders):
+        with self.urlretrieve(self.logo) as (file_location, fileheaders):
             datevalue = fileheaders.get('Date')
             dateformat = '%a, %d %b %Y %H:%M:%S GMT'
             try:
@@ -180,6 +181,31 @@
             except ValueError:
                 self.fail('Date value not in %r format', dateformat)
 
+    def test_reporthook(self):
+        records = []
+        def recording_reporthook(blocks, block_size, total_size):
+            records.append((blocks, block_size, total_size))
+
+        with self.urlretrieve(self.logo, reporthook=recording_reporthook) as (
+                file_location, fileheaders):
+            expected_size = int(fileheaders['Content-Length'])
+
+        records_repr = repr(records)  # For use in error messages.
+        self.assertGreater(len(records), 1, msg="There should always be two "
+                           "calls; the first one before the transfer starts.")
+        self.assertEqual(records[0][0], 0)
+        self.assertGreater(records[0][1], 0,
+                           msg="block size can't be 0 in %s" % records_repr)
+        self.assertEqual(records[0][2], expected_size)
+        self.assertEqual(records[-1][2], expected_size)
+
+        block_sizes = {block_size for _, block_size, _ in records}
+        self.assertEqual({records[0][1]}, block_sizes,
+                         msg="block sizes in %s must be equal" % records_repr)
+        self.assertGreaterEqual(records[-1][0]*records[0][1], expected_size,
+                                msg="number of blocks * block size must be"
+                                " >= total size in %s" % records_repr)
+
 
 def test_main():
     support.requires('network')
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -208,7 +208,7 @@
                 size = int(headers["Content-Length"])
 
             if reporthook:
-                reporthook(blocknum, 0, size)
+                reporthook(blocknum, bs, size)
 
             while True:
                 block = fp.read(bs)
@@ -218,7 +218,7 @@
                 tfp.write(block)
                 blocknum += 1
                 if reporthook:
-                    reporthook(blocknum, len(block), size)
+                    reporthook(blocknum, bs, size)
 
     if size >= 0 and read < size:
         raise ContentTooShortError(
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,11 @@
 Library
 -------
 
+- Issue #16409: The reporthook callback made by the legacy
+  urllib.request.urlretrieve API now properly supplies a constant non-zero
+  block_size as it did in Python 3.2 and 2.7.  This matches the behavior of
+  urllib.request.URLopener.retrieve.
+
 - Issue #16431: Use the type information when constructing a Decimal subtype
   from a Decimal argument.
 

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

From python-checkins at python.org  Sat Nov 10 23:32:40 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat, 10 Nov 2012 23:32:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Accept_Unicode?=
 =?utf-8?q?_legacy_strings_in_the_Decimal_constructor=2E?=
Message-ID: <3XzXzr07vHzPqg@mail.python.org>

http://hg.python.org/cpython/rev/2f35cdd1497b
changeset:   80342:2f35cdd1497b
branch:      3.3
parent:      80340:19e6e32db5ec
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Nov 10 23:09:04 2012 +0100
summary:
  Accept Unicode legacy strings in the Decimal constructor.

files:
  Lib/test/test_decimal.py    |  11 ++++++++++-
  Modules/_decimal/_decimal.c |   4 +++-
  2 files changed, 13 insertions(+), 2 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
@@ -35,7 +35,7 @@
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754)
 from test.support import (check_warnings, import_fresh_module, TestFailed,
-                          run_with_locale)
+                          run_with_locale, cpython_only)
 import random
 import time
 import warnings
@@ -574,6 +574,15 @@
             # embedded NUL
             self.assertRaises(InvalidOperation, Decimal, "12\u00003")
 
+    @cpython_only
+    def test_from_legacy_strings(self):
+        import _testcapi
+        Decimal = self.decimal.Decimal
+        context = self.decimal.Context()
+
+        s = _testcapi.unicode_legacy_string('9.999999')
+        self.assertEqual(str(Decimal(s)), '9.999999')
+        self.assertEqual(str(context.create_decimal(s)), '9.999999')
 
     def test_explicit_from_tuples(self):
         Decimal = self.decimal.Decimal
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -1892,7 +1892,9 @@
     Py_ssize_t j, len;
     int d;
 
-    assert(PyUnicode_IS_READY(u));
+    if (PyUnicode_READY(u) == -1) {
+        return NULL;
+    }
 
     kind = PyUnicode_KIND(u);
     data = PyUnicode_DATA(u);

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

From python-checkins at python.org  Sat Nov 10 23:32:41 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat, 10 Nov 2012 23:32:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XzXzs2W3tzPtW@mail.python.org>

http://hg.python.org/cpython/rev/5459cb9c5942
changeset:   80343:5459cb9c5942
parent:      80341:8c48eb0239ca
parent:      80342:2f35cdd1497b
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Nov 10 23:31:22 2012 +0100
summary:
  Merge 3.3.

files:
  Lib/test/test_decimal.py    |  11 ++++++++++-
  Modules/_decimal/_decimal.c |   4 +++-
  2 files changed, 13 insertions(+), 2 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
@@ -35,7 +35,7 @@
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754)
 from test.support import (check_warnings, import_fresh_module, TestFailed,
-                          run_with_locale)
+                          run_with_locale, cpython_only)
 import random
 import time
 import warnings
@@ -574,6 +574,15 @@
             # embedded NUL
             self.assertRaises(InvalidOperation, Decimal, "12\u00003")
 
+    @cpython_only
+    def test_from_legacy_strings(self):
+        import _testcapi
+        Decimal = self.decimal.Decimal
+        context = self.decimal.Context()
+
+        s = _testcapi.unicode_legacy_string('9.999999')
+        self.assertEqual(str(Decimal(s)), '9.999999')
+        self.assertEqual(str(context.create_decimal(s)), '9.999999')
 
     def test_explicit_from_tuples(self):
         Decimal = self.decimal.Decimal
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -1892,7 +1892,9 @@
     Py_ssize_t j, len;
     int d;
 
-    assert(PyUnicode_IS_READY(u));
+    if (PyUnicode_READY(u) == -1) {
+        return NULL;
+    }
 
     kind = PyUnicode_KIND(u);
     data = PyUnicode_DATA(u);

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

From python-checkins at python.org  Sun Nov 11 00:13:37 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 00:13:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogRml4IHRlc3RfdXJs?=
 =?utf-8?q?lib_broken_by_my_previous_commits=2E__The_assumptions_it_was?=
Message-ID: <3XzYv53sWvzPpY@mail.python.org>

http://hg.python.org/cpython/rev/e19a6194aee4
changeset:   80344:e19a6194aee4
branch:      3.3
parent:      80342:2f35cdd1497b
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 15:12:55 2012 -0800
summary:
  Fix test_urllib broken by my previous commits.  The assumptions it was
testing were added as part of the issue10050 change that caused the
wrong behavior in the first place.  now all test cases agree on the
behavior.

files:
  Lib/test/test_urllib.py |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -455,8 +455,8 @@
         urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
             support.TESTFN, hooktester)
         self.assertEqual(len(report), 2)
-        self.assertEqual(report[0][1], 0)
-        self.assertEqual(report[1][1], 5)
+        self.assertEqual(report[0][2], 5)
+        self.assertEqual(report[1][2], 5)
 
     def test_reporthook_8193_bytes(self):
         # Test on 8193 byte file. Should call reporthook only 3 times (once
@@ -469,9 +469,10 @@
         urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
             support.TESTFN, hooktester)
         self.assertEqual(len(report), 3)
-        self.assertEqual(report[0][1], 0)
+        self.assertEqual(report[0][2], 8193)
+        self.assertEqual(report[0][1], 8192)
         self.assertEqual(report[1][1], 8192)
-        self.assertEqual(report[2][1], 1)
+        self.assertEqual(report[2][1], 8192)
 
 
 class urlretrieve_HttpTests(unittest.TestCase, FakeHTTPMixin):

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

From python-checkins at python.org  Sun Nov 11 00:13:39 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 00:13:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fix_test=5Furllib_broken_by_my_previous_commits=2E__The_?=
 =?utf-8?q?assumptions_it_was?=
Message-ID: <3XzYv73mb5zPtW@mail.python.org>

http://hg.python.org/cpython/rev/dcf9a07830a6
changeset:   80345:dcf9a07830a6
parent:      80343:5459cb9c5942
parent:      80344:e19a6194aee4
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 15:13:20 2012 -0800
summary:
  Fix test_urllib broken by my previous commits.  The assumptions it was
testing were added as part of the issue10050 change that caused the
wrong behavior in the first place.  now all test cases agree on the
behavior.

files:
  Lib/test/test_urllib.py |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -457,8 +457,8 @@
         urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
             support.TESTFN, hooktester)
         self.assertEqual(len(report), 2)
-        self.assertEqual(report[0][1], 0)
-        self.assertEqual(report[1][1], 5)
+        self.assertEqual(report[0][2], 5)
+        self.assertEqual(report[1][2], 5)
 
     def test_reporthook_8193_bytes(self):
         # Test on 8193 byte file. Should call reporthook only 3 times (once
@@ -471,9 +471,10 @@
         urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
             support.TESTFN, hooktester)
         self.assertEqual(len(report), 3)
-        self.assertEqual(report[0][1], 0)
+        self.assertEqual(report[0][2], 8193)
+        self.assertEqual(report[0][1], 8192)
         self.assertEqual(report[1][1], 8192)
-        self.assertEqual(report[2][1], 1)
+        self.assertEqual(report[2][1], 8192)
 
 
 class urlretrieve_HttpTests(unittest.TestCase, FakeHTTPMixin):

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

From python-checkins at python.org  Sun Nov 11 01:29:14 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 01:29:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MzU3?=
 =?utf-8?q?=3A_fix_calling_accept=28=29_on_a_SSLSocket_created_through?=
Message-ID: <3XzbZL3Db3zPpg@mail.python.org>

http://hg.python.org/cpython/rev/f475332df9b5
changeset:   80346:f475332df9b5
branch:      3.2
parent:      80333:16fa6462dfe1
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 01:25:36 2012 +0100
summary:
  Issue #16357: fix calling accept() on a SSLSocket created through SSLContext.wrap_socket().
Original patch by Jeff McNeil.

files:
  Lib/ssl.py           |  15 ++++--------
  Lib/test/test_ssl.py |  36 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   3 ++
  3 files changed, 44 insertions(+), 10 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -491,16 +491,11 @@
         SSL channel, and the address of the remote client."""
 
         newsock, addr = socket.accept(self)
-        return (SSLSocket(sock=newsock,
-                          keyfile=self.keyfile, certfile=self.certfile,
-                          server_side=True,
-                          cert_reqs=self.cert_reqs,
-                          ssl_version=self.ssl_version,
-                          ca_certs=self.ca_certs,
-                          ciphers=self.ciphers,
-                          do_handshake_on_connect=
-                              self.do_handshake_on_connect),
-                addr)
+        newsock = self.context.wrap_socket(newsock,
+                    do_handshake_on_connect=self.do_handshake_on_connect,
+                    suppress_ragged_eofs=self.suppress_ragged_eofs,
+                    server_side=True)
+        return newsock, addr
 
     def __del__(self):
         # sys.stderr.write("__del__ on %s\n" % repr(self))
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
@@ -1610,6 +1610,42 @@
                 t.join()
                 server.close()
 
+        def test_server_accept(self):
+            # Issue #16357: accept() on a SSLSocket created through
+            # SSLContext.wrap_socket().
+            context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+            context.verify_mode = ssl.CERT_REQUIRED
+            context.load_verify_locations(CERTFILE)
+            context.load_cert_chain(CERTFILE)
+            server = socket.socket(socket.AF_INET)
+            host = "127.0.0.1"
+            port = support.bind_port(server)
+            server = context.wrap_socket(server, server_side=True)
+
+            evt = threading.Event()
+            remote = None
+            peer = None
+            def serve():
+                nonlocal remote, peer
+                server.listen(5)
+                # Block on the accept and wait on the connection to close.
+                evt.set()
+                remote, peer = server.accept()
+                remote.recv(1)
+
+            t = threading.Thread(target=serve)
+            t.start()
+            # Client wait until server setup and perform a connect.
+            evt.wait()
+            client = context.wrap_socket(socket.socket())
+            client.connect((host, port))
+            client_addr = client.getsockname()
+            client.close()
+            t.join()
+            # Sanity checks.
+            self.assertIsInstance(remote, ssl.SSLSocket)
+            self.assertEqual(peer, client_addr)
+
         def test_default_ciphers(self):
             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
             try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -159,6 +159,9 @@
 Library
 -------
 
+- Issue #16357: fix calling accept() on a SSLSocket created through
+  SSLContext.wrap_socket().  Original patch by Jeff McNeil.
+
 - Issue #16350: zlib.Decompress.decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
   to the last call. Patch by Serhiy Storchaka.

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

From python-checkins at python.org  Sun Nov 11 01:29:16 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 01:29:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316357=3A_fix_calling_accept=28=29_on_a_SSLSocket_crea?=
 =?utf-8?q?ted_through?=
Message-ID: <3XzbZN01q0zQ0g@mail.python.org>

http://hg.python.org/cpython/rev/9510a9641c80
changeset:   80347:9510a9641c80
branch:      3.3
parent:      80344:e19a6194aee4
parent:      80346:f475332df9b5
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 01:27:33 2012 +0100
summary:
  Issue #16357: fix calling accept() on a SSLSocket created through SSLContext.wrap_socket().
Original patch by Jeff McNeil.

files:
  Lib/ssl.py           |  15 ++++--------
  Lib/test/test_ssl.py |  36 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   3 ++
  3 files changed, 44 insertions(+), 10 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -553,16 +553,11 @@
         SSL channel, and the address of the remote client."""
 
         newsock, addr = socket.accept(self)
-        return (SSLSocket(sock=newsock,
-                          keyfile=self.keyfile, certfile=self.certfile,
-                          server_side=True,
-                          cert_reqs=self.cert_reqs,
-                          ssl_version=self.ssl_version,
-                          ca_certs=self.ca_certs,
-                          ciphers=self.ciphers,
-                          do_handshake_on_connect=
-                              self.do_handshake_on_connect),
-                addr)
+        newsock = self.context.wrap_socket(newsock,
+                    do_handshake_on_connect=self.do_handshake_on_connect,
+                    suppress_ragged_eofs=self.suppress_ragged_eofs,
+                    server_side=True)
+        return newsock, addr
 
     def get_channel_binding(self, cb_type="tls-unique"):
         """Get channel binding data for current connection.  Raise ValueError
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
@@ -1796,6 +1796,42 @@
                 t.join()
                 server.close()
 
+        def test_server_accept(self):
+            # Issue #16357: accept() on a SSLSocket created through
+            # SSLContext.wrap_socket().
+            context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+            context.verify_mode = ssl.CERT_REQUIRED
+            context.load_verify_locations(CERTFILE)
+            context.load_cert_chain(CERTFILE)
+            server = socket.socket(socket.AF_INET)
+            host = "127.0.0.1"
+            port = support.bind_port(server)
+            server = context.wrap_socket(server, server_side=True)
+
+            evt = threading.Event()
+            remote = None
+            peer = None
+            def serve():
+                nonlocal remote, peer
+                server.listen(5)
+                # Block on the accept and wait on the connection to close.
+                evt.set()
+                remote, peer = server.accept()
+                remote.recv(1)
+
+            t = threading.Thread(target=serve)
+            t.start()
+            # Client wait until server setup and perform a connect.
+            evt.wait()
+            client = context.wrap_socket(socket.socket())
+            client.connect((host, port))
+            client_addr = client.getsockname()
+            client.close()
+            t.join()
+            # Sanity checks.
+            self.assertIsInstance(remote, ssl.SSLSocket)
+            self.assertEqual(peer, client_addr)
+
         def test_default_ciphers(self):
             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
             try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,9 @@
 Library
 -------
 
+- Issue #16357: fix calling accept() on a SSLSocket created through
+  SSLContext.wrap_socket().  Original patch by Jeff McNeil.
+
 - Issue #16409: The reporthook callback made by the legacy
   urllib.request.urlretrieve API now properly supplies a constant non-zero
   block_size as it did in Python 3.2 and 2.7.  This matches the behavior of

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

From python-checkins at python.org  Sun Nov 11 01:29:17 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 01:29:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316357=3A_fix_calling_accept=28=29_on_a_SSLSocke?=
 =?utf-8?q?t_created_through?=
Message-ID: <3XzbZP3sVQzQ4X@mail.python.org>

http://hg.python.org/cpython/rev/5fc30f0277a5
changeset:   80348:5fc30f0277a5
parent:      80345:dcf9a07830a6
parent:      80347:9510a9641c80
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 01:28:22 2012 +0100
summary:
  Issue #16357: fix calling accept() on a SSLSocket created through SSLContext.wrap_socket().
Original patch by Jeff McNeil.

files:
  Lib/ssl.py           |  15 ++++--------
  Lib/test/test_ssl.py |  36 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   3 ++
  3 files changed, 44 insertions(+), 10 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -553,16 +553,11 @@
         SSL channel, and the address of the remote client."""
 
         newsock, addr = socket.accept(self)
-        return (SSLSocket(sock=newsock,
-                          keyfile=self.keyfile, certfile=self.certfile,
-                          server_side=True,
-                          cert_reqs=self.cert_reqs,
-                          ssl_version=self.ssl_version,
-                          ca_certs=self.ca_certs,
-                          ciphers=self.ciphers,
-                          do_handshake_on_connect=
-                              self.do_handshake_on_connect),
-                addr)
+        newsock = self.context.wrap_socket(newsock,
+                    do_handshake_on_connect=self.do_handshake_on_connect,
+                    suppress_ragged_eofs=self.suppress_ragged_eofs,
+                    server_side=True)
+        return newsock, addr
 
     def get_channel_binding(self, cb_type="tls-unique"):
         """Get channel binding data for current connection.  Raise ValueError
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
@@ -1796,6 +1796,42 @@
                 t.join()
                 server.close()
 
+        def test_server_accept(self):
+            # Issue #16357: accept() on a SSLSocket created through
+            # SSLContext.wrap_socket().
+            context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+            context.verify_mode = ssl.CERT_REQUIRED
+            context.load_verify_locations(CERTFILE)
+            context.load_cert_chain(CERTFILE)
+            server = socket.socket(socket.AF_INET)
+            host = "127.0.0.1"
+            port = support.bind_port(server)
+            server = context.wrap_socket(server, server_side=True)
+
+            evt = threading.Event()
+            remote = None
+            peer = None
+            def serve():
+                nonlocal remote, peer
+                server.listen(5)
+                # Block on the accept and wait on the connection to close.
+                evt.set()
+                remote, peer = server.accept()
+                remote.recv(1)
+
+            t = threading.Thread(target=serve)
+            t.start()
+            # Client wait until server setup and perform a connect.
+            evt.wait()
+            client = context.wrap_socket(socket.socket())
+            client.connect((host, port))
+            client_addr = client.getsockname()
+            client.close()
+            t.join()
+            # Sanity checks.
+            self.assertIsInstance(remote, ssl.SSLSocket)
+            self.assertEqual(peer, client_addr)
+
         def test_default_ciphers(self):
             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
             try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,9 @@
 Library
 -------
 
+- Issue #16357: fix calling accept() on a SSLSocket created through
+  SSLContext.wrap_socket().  Original patch by Jeff McNeil.
+
 - Issue #16409: The reporthook callback made by the legacy
   urllib.request.urlretrieve API now properly supplies a constant non-zero
   block_size as it did in Python 3.2 and 2.7.  This matches the behavior of

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

From python-checkins at python.org  Sun Nov 11 02:26:27 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 02:26:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MzUw?=
 =?utf-8?q?=2C_part_2=3A_Set_unused=5Fdata_=28and_unconsumed=5Ftail=29_cor?=
 =?utf-8?q?rectly_in?=
Message-ID: <3XzcrM42sJzQ0g@mail.python.org>

http://hg.python.org/cpython/rev/94256d7804b8
changeset:   80349:94256d7804b8
branch:      2.7
parent:      80336:24db5292c2c9
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 02:14:15 2012 +0100
summary:
  Issue #16350, part 2: Set unused_data (and unconsumed_tail) correctly in decompressobj().flush().

Additionally, fix a bug where a MemoryError in allocating a bytes object could
leave the decompressor object in an invalid state (with its unconsumed_tail
member being NULL).

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |   30 ++++++--
  Misc/NEWS             |    6 +-
  Modules/zlibmodule.c  |  100 ++++++++++++++++-------------
  3 files changed, 80 insertions(+), 56 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -429,15 +429,27 @@
     def test_decompress_unused_data(self):
         # Repeated calls to decompress() after EOF should accumulate data in
         # dco.unused_data, instead of just storing the arg to the last call.
-        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
-        for step in 1, 2, 100:
-            dco = zlib.decompressobj()
-            data = b''.join(dco.decompress(x[i : i + step])
-                            for i in range(0, len(x), step))
-            data += dco.flush()
-
-            self.assertEqual(data, HAMLET_SCENE)
-            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+        source = b'abcdefghijklmnopqrstuvwxyz'
+        remainder = b'0123456789'
+        y = zlib.compress(source)
+        x = y + remainder
+        for maxlen in 0, 1000:
+            for step in 1, 2, len(y), len(x):
+                dco = zlib.decompressobj()
+                data = b''
+                for i in range(0, len(x), step):
+                    if i < len(y):
+                        self.assertEqual(dco.unused_data, b'')
+                    if maxlen == 0:
+                        data += dco.decompress(x[i : i + step])
+                        self.assertEqual(dco.unconsumed_tail, b'')
+                    else:
+                        data += dco.decompress(
+                                dco.unconsumed_tail + x[i : i + step], maxlen)
+                data += dco.flush()
+                self.assertEqual(data, source)
+                self.assertEqual(dco.unconsumed_tail, b'')
+                self.assertEqual(dco.unused_data, remainder)
 
     if hasattr(zlib.decompressobj(), "copy"):
         def test_decompresscopy(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,9 +140,11 @@
 Library
 -------
 
-- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+- Issue #16350: zlib.decompressobj().decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
-  to the last call. Patch by Serhiy Storchaka.
+  to the last call. decompressobj().flush() now correctly sets unused_data and
+  unconsumed_tail. A bug in the handling of MemoryError when setting the
+  unconsumed_tail attribute has also been fixed. Patch by Serhiy Storchaka.
 
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -467,6 +467,49 @@
     return RetVal;
 }
 
+/* Helper for objdecompress() and unflush(). Saves any unconsumed input data in
+   self->unused_data or self->unconsumed_tail, as appropriate. */
+static int
+save_unconsumed_input(compobject *self, int err)
+{
+    if (err == Z_STREAM_END) {
+        /* The end of the compressed data has been reached. Store the leftover
+           input data in self->unused_data. */
+        if (self->zst.avail_in > 0) {
+            Py_ssize_t old_size = PyString_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size;
+            PyObject *new_data;
+            if (self->zst.avail_in > PY_SSIZE_T_MAX - old_size) {
+                PyErr_NoMemory();
+                return -1;
+            }
+            new_size = old_size + self->zst.avail_in;
+            new_data = PyString_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL)
+                return -1;
+            Py_MEMCPY(PyString_AS_STRING(new_data),
+                      PyString_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyString_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
+            self->zst.avail_in = 0;
+        }
+    }
+    if (self->zst.avail_in > 0 || PyString_GET_SIZE(self->unconsumed_tail)) {
+        /* This code handles two distinct cases:
+           1. Output limit was reached. Save leftover input in unconsumed_tail.
+           2. All input data was consumed. Clear unconsumed_tail. */
+        PyObject *new_data = PyString_FromStringAndSize(
+                (char *)self->zst.next_in, self->zst.avail_in);
+        if (new_data == NULL)
+            return -1;
+        Py_DECREF(self->unconsumed_tail);
+        self->unconsumed_tail = new_data;
+    }
+    return 0;
+}
+
 PyDoc_STRVAR(decomp_decompress__doc__,
 "decompress(data, max_length) -- Return a string containing the decompressed\n"
 "version of the data.\n"
@@ -541,60 +584,20 @@
         Py_END_ALLOW_THREADS
     }
 
-    if(max_length) {
-        /* Not all of the compressed data could be accommodated in a buffer of
-           the specified size. Return the unconsumed tail in an attribute. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyString_FromStringAndSize((char *)self->zst.next_in,
-                                                           self->zst.avail_in);
-    }
-    else if (PyString_GET_SIZE(self->unconsumed_tail) > 0) {
-        /* All of the compressed data was consumed. Clear unconsumed_tail. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyString_FromStringAndSize("", 0);
-    }
-    if(!self->unconsumed_tail) {
+    if (save_unconsumed_input(self, err) < 0) {
         Py_DECREF(RetVal);
         RetVal = NULL;
         goto error;
     }
 
-    /* The end of the compressed data has been reached, so set the
-       unused_data attribute to a string containing the remainder of the
-       data in the string.  Note that this is also a logical place to call
-       inflateEnd, but the old behaviour of only calling it on flush() is
-       preserved.
-    */
-    if (err == Z_STREAM_END) {
-        if (self->zst.avail_in > 0) {
-            /* Append the leftover data to the existing value of unused_data. */
-            Py_ssize_t old_size = PyString_GET_SIZE(self->unused_data);
-            Py_ssize_t new_size = old_size + self->zst.avail_in;
-            PyObject *new_data;
-            if (new_size <= old_size) {  /* Check for overflow. */
-                PyErr_NoMemory();
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            new_data = PyString_FromStringAndSize(NULL, new_size);
-            if (new_data == NULL) {
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            Py_MEMCPY(PyString_AS_STRING(new_data),
-                      PyString_AS_STRING(self->unused_data), old_size);
-            Py_MEMCPY(PyString_AS_STRING(new_data) + old_size,
-                      self->zst.next_in, self->zst.avail_in);
-            Py_DECREF(self->unused_data);
-            self->unused_data = new_data;
-        }
+    /* This is the logical place to call inflateEnd, but the old behaviour of
+       only calling it on flush() is preserved. */
+
+    if (err != Z_STREAM_END && err != Z_OK && err != Z_BUF_ERROR) {
         /* We will only get Z_BUF_ERROR if the output buffer was full
            but there wasn't more output when we tried again, so it is
            not an error condition.
         */
-    } else if (err != Z_OK && err != Z_BUF_ERROR) {
         zlib_error(self->zst, err, "while decompressing");
         Py_DECREF(RetVal);
         RetVal = NULL;
@@ -848,6 +851,12 @@
         Py_END_ALLOW_THREADS
     }
 
+    if (save_unconsumed_input(self, err) < 0) {
+        Py_DECREF(retval);
+        retval = NULL;
+        goto error;
+    }
+
     /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
        various data structures. Note we should only get Z_STREAM_END when
        flushmode is Z_FINISH */
@@ -861,6 +870,7 @@
             goto error;
         }
     }
+
     _PyString_Resize(&retval, self->zst.total_out - start_total_out);
 
 error:

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

From python-checkins at python.org  Sun Nov 11 02:26:29 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 02:26:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MzUw?=
 =?utf-8?q?=2C_part_2=3A_Set_unused=5Fdata_=28and_unconsumed=5Ftail=29_cor?=
 =?utf-8?q?rectly_in?=
Message-ID: <3XzcrP0bqNzQ3Z@mail.python.org>

http://hg.python.org/cpython/rev/85886268c40b
changeset:   80350:85886268c40b
branch:      3.2
parent:      80346:f475332df9b5
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 02:14:36 2012 +0100
summary:
  Issue #16350, part 2: Set unused_data (and unconsumed_tail) correctly in decompressobj().flush().

Additionally, fix a bug where a MemoryError in allocating a bytes object could
leave the decompressor object in an invalid state (with its unconsumed_tail
member being NULL).

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |   30 ++++++--
  Misc/NEWS             |    6 +-
  Modules/zlibmodule.c  |  100 ++++++++++++++++-------------
  3 files changed, 80 insertions(+), 56 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -437,15 +437,27 @@
     def test_decompress_unused_data(self):
         # Repeated calls to decompress() after EOF should accumulate data in
         # dco.unused_data, instead of just storing the arg to the last call.
-        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
-        for step in 1, 2, 100:
-            dco = zlib.decompressobj()
-            data = b''.join(dco.decompress(x[i : i + step])
-                            for i in range(0, len(x), step))
-            data += dco.flush()
-
-            self.assertEqual(data, HAMLET_SCENE)
-            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+        source = b'abcdefghijklmnopqrstuvwxyz'
+        remainder = b'0123456789'
+        y = zlib.compress(source)
+        x = y + remainder
+        for maxlen in 0, 1000:
+            for step in 1, 2, len(y), len(x):
+                dco = zlib.decompressobj()
+                data = b''
+                for i in range(0, len(x), step):
+                    if i < len(y):
+                        self.assertEqual(dco.unused_data, b'')
+                    if maxlen == 0:
+                        data += dco.decompress(x[i : i + step])
+                        self.assertEqual(dco.unconsumed_tail, b'')
+                    else:
+                        data += dco.decompress(
+                                dco.unconsumed_tail + x[i : i + step], maxlen)
+                data += dco.flush()
+                self.assertEqual(data, source)
+                self.assertEqual(dco.unconsumed_tail, b'')
+                self.assertEqual(dco.unused_data, remainder)
 
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -162,9 +162,11 @@
 - Issue #16357: fix calling accept() on a SSLSocket created through
   SSLContext.wrap_socket().  Original patch by Jeff McNeil.
 
-- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+- Issue #16350: zlib.decompressobj().decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
-  to the last call. Patch by Serhiy Storchaka.
+  to the last call. decompressobj().flush() now correctly sets unused_data and
+  unconsumed_tail. A bug in the handling of MemoryError when setting the
+  unconsumed_tail attribute has also been fixed. Patch by Serhiy Storchaka.
 
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -499,6 +499,49 @@
     return RetVal;
 }
 
+/* Helper for objdecompress() and unflush(). Saves any unconsumed input data in
+   self->unused_data or self->unconsumed_tail, as appropriate. */
+static int
+save_unconsumed_input(compobject *self, int err)
+{
+    if (err == Z_STREAM_END) {
+        /* The end of the compressed data has been reached. Store the leftover
+           input data in self->unused_data. */
+        if (self->zst.avail_in > 0) {
+            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size;
+            PyObject *new_data;
+            if (self->zst.avail_in > PY_SSIZE_T_MAX - old_size) {
+                PyErr_NoMemory();
+                return -1;
+            }
+            new_size = old_size + self->zst.avail_in;
+            new_data = PyBytes_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL)
+                return -1;
+            Py_MEMCPY(PyBytes_AS_STRING(new_data),
+                      PyBytes_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
+            self->zst.avail_in = 0;
+        }
+    }
+    if (self->zst.avail_in > 0 || PyBytes_GET_SIZE(self->unconsumed_tail)) {
+        /* This code handles two distinct cases:
+           1. Output limit was reached. Save leftover input in unconsumed_tail.
+           2. All input data was consumed. Clear unconsumed_tail. */
+        PyObject *new_data = PyBytes_FromStringAndSize(
+                (char *)self->zst.next_in, self->zst.avail_in);
+        if (new_data == NULL)
+            return -1;
+        Py_DECREF(self->unconsumed_tail);
+        self->unconsumed_tail = new_data;
+    }
+    return 0;
+}
+
 PyDoc_STRVAR(decomp_decompress__doc__,
 "decompress(data, max_length) -- Return a string containing the decompressed\n"
 "version of the data.\n"
@@ -585,60 +628,20 @@
         Py_END_ALLOW_THREADS
     }
 
-    if(max_length) {
-        /* Not all of the compressed data could be accommodated in a buffer of
-           the specified size. Return the unconsumed tail in an attribute. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyBytes_FromStringAndSize((char *)self->zst.next_in,
-                                                           self->zst.avail_in);
-    }
-    else if (PyBytes_GET_SIZE(self->unconsumed_tail) > 0) {
-        /* All of the compressed data was consumed. Clear unconsumed_tail. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyBytes_FromStringAndSize("", 0);
-    }
-    if (self->unconsumed_tail == NULL) {
+    if (save_unconsumed_input(self, err) < 0) {
         Py_DECREF(RetVal);
         RetVal = NULL;
         goto error;
     }
 
-    /* The end of the compressed data has been reached, so set the
-       unused_data attribute to a string containing the remainder of the
-       data in the string.  Note that this is also a logical place to call
-       inflateEnd, but the old behaviour of only calling it on flush() is
-       preserved.
-    */
-    if (err == Z_STREAM_END) {
-        if (self->zst.avail_in > 0) {
-            /* Append the leftover data to the existing value of unused_data. */
-            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
-            Py_ssize_t new_size = old_size + self->zst.avail_in;
-            PyObject *new_data;
-            if (new_size <= old_size) {  /* Check for overflow. */
-                PyErr_NoMemory();
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            new_data = PyBytes_FromStringAndSize(NULL, new_size);
-            if (new_data == NULL) {
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            Py_MEMCPY(PyBytes_AS_STRING(new_data),
-                      PyBytes_AS_STRING(self->unused_data), old_size);
-            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
-                      self->zst.next_in, self->zst.avail_in);
-            Py_DECREF(self->unused_data);
-            self->unused_data = new_data;
-        }
+    /* This is the logical place to call inflateEnd, but the old behaviour of
+       only calling it on flush() is preserved. */
+
+    if (err != Z_STREAM_END && err != Z_OK && err != Z_BUF_ERROR) {
         /* We will only get Z_BUF_ERROR if the output buffer was full
            but there wasn't more output when we tried again, so it is
            not an error condition.
         */
-    } else if (err != Z_OK && err != Z_BUF_ERROR) {
         zlib_error(self->zst, err, "while decompressing");
         Py_DECREF(RetVal);
         RetVal = NULL;
@@ -904,6 +907,12 @@
         Py_END_ALLOW_THREADS
     }
 
+    if (save_unconsumed_input(self, err) < 0) {
+        Py_DECREF(retval);
+        retval = NULL;
+        goto error;
+    }
+
     /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
        various data structures. Note we should only get Z_STREAM_END when
        flushmode is Z_FINISH */
@@ -917,6 +926,7 @@
             goto error;
         }
     }
+
     if (_PyBytes_Resize(&retval, self->zst.total_out - start_total_out) < 0) {
         Py_DECREF(retval);
         retval = NULL;

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

From python-checkins at python.org  Sun Nov 11 02:26:30 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 02:26:30 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316350=2C_part_2=3A_Set_unused=5Fdata_=28and_unconsume?=
 =?utf-8?q?d=5Ftail=29_correctly_in?=
Message-ID: <3XzcrQ4SZGzPvd@mail.python.org>

http://hg.python.org/cpython/rev/654eb5163ba1
changeset:   80351:654eb5163ba1
branch:      3.3
parent:      80347:9510a9641c80
parent:      80350:85886268c40b
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 02:21:22 2012 +0100
summary:
  Issue #16350, part 2: Set unused_data (and unconsumed_tail) correctly in decompressobj().flush().

Additionally, fix a bug where a MemoryError in allocating a bytes object could
leave the decompressor object in an invalid state (with its unconsumed_tail
member being NULL).

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  32 ++++++---
  Misc/NEWS             |   6 +-
  Modules/zlibmodule.c  |  98 +++++++++++++++++-------------
  3 files changed, 80 insertions(+), 56 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -490,16 +490,28 @@
     def test_decompress_unused_data(self):
         # Repeated calls to decompress() after EOF should accumulate data in
         # dco.unused_data, instead of just storing the arg to the last call.
-        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
-        for step in 1, 2, 100:
-            dco = zlib.decompressobj()
-            data = b''.join(dco.decompress(x[i : i + step])
-                            for i in range(0, len(x), step))
-            data += dco.flush()
-
-            self.assertTrue(dco.eof)
-            self.assertEqual(data, HAMLET_SCENE)
-            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+        source = b'abcdefghijklmnopqrstuvwxyz'
+        remainder = b'0123456789'
+        y = zlib.compress(source)
+        x = y + remainder
+        for maxlen in 0, 1000:
+            for step in 1, 2, len(y), len(x):
+                dco = zlib.decompressobj()
+                data = b''
+                for i in range(0, len(x), step):
+                    if i < len(y):
+                        self.assertEqual(dco.unused_data, b'')
+                    if maxlen == 0:
+                        data += dco.decompress(x[i : i + step])
+                        self.assertEqual(dco.unconsumed_tail, b'')
+                    else:
+                        data += dco.decompress(
+                                dco.unconsumed_tail + x[i : i + step], maxlen)
+                data += dco.flush()
+                self.assertTrue(dco.eof)
+                self.assertEqual(data, source)
+                self.assertEqual(dco.unconsumed_tail, b'')
+                self.assertEqual(dco.unused_data, remainder)
 
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,9 +91,11 @@
 - Issue #16431: Use the type information when constructing a Decimal subtype
   from a Decimal argument.
 
-- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+- Issue #16350: zlib.decompressobj().decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
-  to the last call. Patch by Serhiy Storchaka.
+  to the last call. decompressobj().flush() now correctly sets unused_data and
+  unconsumed_tail. A bug in the handling of MemoryError when setting the
+  unconsumed_tail attribute has also been fixed. Patch by Serhiy Storchaka.
 
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -561,6 +561,49 @@
     return RetVal;
 }
 
+/* Helper for objdecompress() and unflush(). Saves any unconsumed input data in
+   self->unused_data or self->unconsumed_tail, as appropriate. */
+static int
+save_unconsumed_input(compobject *self, int err)
+{
+    if (err == Z_STREAM_END) {
+        /* The end of the compressed data has been reached. Store the leftover
+           input data in self->unused_data. */
+        if (self->zst.avail_in > 0) {
+            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size;
+            PyObject *new_data;
+            if (self->zst.avail_in > PY_SSIZE_T_MAX - old_size) {
+                PyErr_NoMemory();
+                return -1;
+            }
+            new_size = old_size + self->zst.avail_in;
+            new_data = PyBytes_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL)
+                return -1;
+            Py_MEMCPY(PyBytes_AS_STRING(new_data),
+                      PyBytes_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
+            self->zst.avail_in = 0;
+        }
+    }
+    if (self->zst.avail_in > 0 || PyBytes_GET_SIZE(self->unconsumed_tail)) {
+        /* This code handles two distinct cases:
+           1. Output limit was reached. Save leftover input in unconsumed_tail.
+           2. All input data was consumed. Clear unconsumed_tail. */
+        PyObject *new_data = PyBytes_FromStringAndSize(
+                (char *)self->zst.next_in, self->zst.avail_in);
+        if (new_data == NULL)
+            return -1;
+        Py_DECREF(self->unconsumed_tail);
+        self->unconsumed_tail = new_data;
+    }
+    return 0;
+}
+
 PyDoc_STRVAR(decomp_decompress__doc__,
 "decompress(data, max_length) -- Return a string containing the decompressed\n"
 "version of the data.\n"
@@ -668,61 +711,21 @@
         Py_END_ALLOW_THREADS
     }
 
-    if(max_length) {
-        /* Not all of the compressed data could be accommodated in a buffer of
-           the specified size. Return the unconsumed tail in an attribute. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyBytes_FromStringAndSize((char *)self->zst.next_in,
-                                                           self->zst.avail_in);
-    }
-    else if (PyBytes_GET_SIZE(self->unconsumed_tail) > 0) {
-        /* All of the compressed data was consumed. Clear unconsumed_tail. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyBytes_FromStringAndSize("", 0);
-    }
-    if (self->unconsumed_tail == NULL) {
+    if (save_unconsumed_input(self, err) < 0) {
         Py_DECREF(RetVal);
         RetVal = NULL;
         goto error;
     }
 
-    /* The end of the compressed data has been reached, so set the
-       unused_data attribute to a string containing the remainder of the
-       data in the string.  Note that this is also a logical place to call
-       inflateEnd, but the old behaviour of only calling it on flush() is
-       preserved.
-    */
     if (err == Z_STREAM_END) {
-        if (self->zst.avail_in > 0) {
-            /* Append the leftover data to the existing value of unused_data. */
-            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
-            Py_ssize_t new_size = old_size + self->zst.avail_in;
-            PyObject *new_data;
-            if (new_size <= old_size) {  /* Check for overflow. */
-                PyErr_NoMemory();
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            new_data = PyBytes_FromStringAndSize(NULL, new_size);
-            if (new_data == NULL) {
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            Py_MEMCPY(PyBytes_AS_STRING(new_data),
-                      PyBytes_AS_STRING(self->unused_data), old_size);
-            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
-                      self->zst.next_in, self->zst.avail_in);
-            Py_DECREF(self->unused_data);
-            self->unused_data = new_data;
-        }
+        /* This is the logical place to call inflateEnd, but the old behaviour
+           of only calling it on flush() is preserved. */
         self->eof = 1;
+    } else if (err != Z_OK && err != Z_BUF_ERROR) {
         /* We will only get Z_BUF_ERROR if the output buffer was full
            but there wasn't more output when we tried again, so it is
            not an error condition.
         */
-    } else if (err != Z_OK && err != Z_BUF_ERROR) {
         zlib_error(self->zst, err, "while decompressing data");
         Py_DECREF(RetVal);
         RetVal = NULL;
@@ -996,6 +999,12 @@
         Py_END_ALLOW_THREADS
     }
 
+    if (save_unconsumed_input(self, err) < 0) {
+        Py_DECREF(retval);
+        retval = NULL;
+        goto error;
+    }
+
     /* If at end of stream, clean up any memory allocated by zlib. */
     if (err == Z_STREAM_END) {
         self->eof = 1;
@@ -1008,6 +1017,7 @@
             goto error;
         }
     }
+
     if (_PyBytes_Resize(&retval, self->zst.total_out - start_total_out) < 0) {
         Py_DECREF(retval);
         retval = NULL;

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

From python-checkins at python.org  Sun Nov 11 02:26:32 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 02:26:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316350=2C_part_2=3A_Set_unused=5Fdata_=28and_unc?=
 =?utf-8?q?onsumed=5Ftail=29_correctly_in?=
Message-ID: <3XzcrS0wWyzQ4T@mail.python.org>

http://hg.python.org/cpython/rev/4440e45c10f9
changeset:   80352:4440e45c10f9
parent:      80348:5fc30f0277a5
parent:      80351:654eb5163ba1
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 02:24:37 2012 +0100
summary:
  Issue #16350, part 2: Set unused_data (and unconsumed_tail) correctly in decompressobj().flush().

Additionally, fix a bug where a MemoryError in allocating a bytes object could
leave the decompressor object in an invalid state (with its unconsumed_tail
member being NULL).

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  32 ++++++---
  Misc/NEWS             |   6 +-
  Modules/zlibmodule.c  |  98 +++++++++++++++++-------------
  3 files changed, 80 insertions(+), 56 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -490,16 +490,28 @@
     def test_decompress_unused_data(self):
         # Repeated calls to decompress() after EOF should accumulate data in
         # dco.unused_data, instead of just storing the arg to the last call.
-        x = zlib.compress(HAMLET_SCENE) + HAMLET_SCENE
-        for step in 1, 2, 100:
-            dco = zlib.decompressobj()
-            data = b''.join(dco.decompress(x[i : i + step])
-                            for i in range(0, len(x), step))
-            data += dco.flush()
-
-            self.assertTrue(dco.eof)
-            self.assertEqual(data, HAMLET_SCENE)
-            self.assertEqual(dco.unused_data, HAMLET_SCENE)
+        source = b'abcdefghijklmnopqrstuvwxyz'
+        remainder = b'0123456789'
+        y = zlib.compress(source)
+        x = y + remainder
+        for maxlen in 0, 1000:
+            for step in 1, 2, len(y), len(x):
+                dco = zlib.decompressobj()
+                data = b''
+                for i in range(0, len(x), step):
+                    if i < len(y):
+                        self.assertEqual(dco.unused_data, b'')
+                    if maxlen == 0:
+                        data += dco.decompress(x[i : i + step])
+                        self.assertEqual(dco.unconsumed_tail, b'')
+                    else:
+                        data += dco.decompress(
+                                dco.unconsumed_tail + x[i : i + step], maxlen)
+                data += dco.flush()
+                self.assertTrue(dco.eof)
+                self.assertEqual(data, source)
+                self.assertEqual(dco.unconsumed_tail, b'')
+                self.assertEqual(dco.unused_data, remainder)
 
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,9 +127,11 @@
 - Issue #15641: Clean up deprecated classes from importlib
   Patch by Taras Lyapun.
 
-- Issue #16350: zlib.Decompress.decompress() now accumulates data from
+- Issue #16350: zlib.decompressobj().decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
-  to the last call. Patch by Serhiy Storchaka.
+  to the last call. decompressobj().flush() now correctly sets unused_data and
+  unconsumed_tail. A bug in the handling of MemoryError when setting the
+  unconsumed_tail attribute has also been fixed. Patch by Serhiy Storchaka.
 
 - Issue #12759: sre_parse now raises a proper error when the name of the group
   is missing.  Initial patch by Serhiy Storchaka.
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -561,6 +561,49 @@
     return RetVal;
 }
 
+/* Helper for objdecompress() and unflush(). Saves any unconsumed input data in
+   self->unused_data or self->unconsumed_tail, as appropriate. */
+static int
+save_unconsumed_input(compobject *self, int err)
+{
+    if (err == Z_STREAM_END) {
+        /* The end of the compressed data has been reached. Store the leftover
+           input data in self->unused_data. */
+        if (self->zst.avail_in > 0) {
+            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
+            Py_ssize_t new_size;
+            PyObject *new_data;
+            if (self->zst.avail_in > PY_SSIZE_T_MAX - old_size) {
+                PyErr_NoMemory();
+                return -1;
+            }
+            new_size = old_size + self->zst.avail_in;
+            new_data = PyBytes_FromStringAndSize(NULL, new_size);
+            if (new_data == NULL)
+                return -1;
+            Py_MEMCPY(PyBytes_AS_STRING(new_data),
+                      PyBytes_AS_STRING(self->unused_data), old_size);
+            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
+                      self->zst.next_in, self->zst.avail_in);
+            Py_DECREF(self->unused_data);
+            self->unused_data = new_data;
+            self->zst.avail_in = 0;
+        }
+    }
+    if (self->zst.avail_in > 0 || PyBytes_GET_SIZE(self->unconsumed_tail)) {
+        /* This code handles two distinct cases:
+           1. Output limit was reached. Save leftover input in unconsumed_tail.
+           2. All input data was consumed. Clear unconsumed_tail. */
+        PyObject *new_data = PyBytes_FromStringAndSize(
+                (char *)self->zst.next_in, self->zst.avail_in);
+        if (new_data == NULL)
+            return -1;
+        Py_DECREF(self->unconsumed_tail);
+        self->unconsumed_tail = new_data;
+    }
+    return 0;
+}
+
 PyDoc_STRVAR(decomp_decompress__doc__,
 "decompress(data, max_length) -- Return a string containing the decompressed\n"
 "version of the data.\n"
@@ -668,61 +711,21 @@
         Py_END_ALLOW_THREADS
     }
 
-    if(max_length) {
-        /* Not all of the compressed data could be accommodated in a buffer of
-           the specified size. Return the unconsumed tail in an attribute. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyBytes_FromStringAndSize((char *)self->zst.next_in,
-                                                           self->zst.avail_in);
-    }
-    else if (PyBytes_GET_SIZE(self->unconsumed_tail) > 0) {
-        /* All of the compressed data was consumed. Clear unconsumed_tail. */
-        Py_DECREF(self->unconsumed_tail);
-        self->unconsumed_tail = PyBytes_FromStringAndSize("", 0);
-    }
-    if (self->unconsumed_tail == NULL) {
+    if (save_unconsumed_input(self, err) < 0) {
         Py_DECREF(RetVal);
         RetVal = NULL;
         goto error;
     }
 
-    /* The end of the compressed data has been reached, so set the
-       unused_data attribute to a string containing the remainder of the
-       data in the string.  Note that this is also a logical place to call
-       inflateEnd, but the old behaviour of only calling it on flush() is
-       preserved.
-    */
     if (err == Z_STREAM_END) {
-        if (self->zst.avail_in > 0) {
-            /* Append the leftover data to the existing value of unused_data. */
-            Py_ssize_t old_size = PyBytes_GET_SIZE(self->unused_data);
-            Py_ssize_t new_size = old_size + self->zst.avail_in;
-            PyObject *new_data;
-            if (new_size <= old_size) {  /* Check for overflow. */
-                PyErr_NoMemory();
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            new_data = PyBytes_FromStringAndSize(NULL, new_size);
-            if (new_data == NULL) {
-                Py_DECREF(RetVal);
-                RetVal = NULL;
-                goto error;
-            }
-            Py_MEMCPY(PyBytes_AS_STRING(new_data),
-                      PyBytes_AS_STRING(self->unused_data), old_size);
-            Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
-                      self->zst.next_in, self->zst.avail_in);
-            Py_DECREF(self->unused_data);
-            self->unused_data = new_data;
-        }
+        /* This is the logical place to call inflateEnd, but the old behaviour
+           of only calling it on flush() is preserved. */
         self->eof = 1;
+    } else if (err != Z_OK && err != Z_BUF_ERROR) {
         /* We will only get Z_BUF_ERROR if the output buffer was full
            but there wasn't more output when we tried again, so it is
            not an error condition.
         */
-    } else if (err != Z_OK && err != Z_BUF_ERROR) {
         zlib_error(self->zst, err, "while decompressing data");
         Py_DECREF(RetVal);
         RetVal = NULL;
@@ -996,6 +999,12 @@
         Py_END_ALLOW_THREADS
     }
 
+    if (save_unconsumed_input(self, err) < 0) {
+        Py_DECREF(retval);
+        retval = NULL;
+        goto error;
+    }
+
     /* If at end of stream, clean up any memory allocated by zlib. */
     if (err == Z_STREAM_END) {
         self->eof = 1;
@@ -1008,6 +1017,7 @@
             goto error;
         }
     }
+
     if (_PyBytes_Resize(&retval, self->zst.total_out - start_total_out) < 0) {
         Py_DECREF(retval);
         retval = NULL;

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

From python-checkins at python.org  Sun Nov 11 03:20:24 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 03:20:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2NDEx?=
 =?utf-8?q?=3A_Fix_a_bug_where_zlib=2Edecompressobj=28=29=2Eflush=28=29_mi?=
 =?utf-8?q?ght_try_to_access?=
Message-ID: <3Xzf2c2yMNzPn3@mail.python.org>

http://hg.python.org/cpython/rev/c3828831861c
changeset:   80353:c3828831861c
branch:      2.7
parent:      80349:94256d7804b8
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 03:14:56 2012 +0100
summary:
  Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  12 ++++++++++++
  Misc/NEWS             |   3 +++
  Modules/zlibmodule.c  |   2 ++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -396,6 +396,18 @@
         y += dco.flush()
         self.assertEqual(y, 'foo')
 
+    def test_flush_with_freed_input(self):
+        # Issue #16411: decompressor accesses input to last decompress() call
+        # in flush(), even if this object has been freed in the meanwhile.
+        input1 = 'abcdefghijklmnopqrstuvwxyz'
+        input2 = 'QWERTYUIOPASDFGHJKLZXCVBNM'
+        data = zlib.compress(input1)
+        dco = zlib.decompressobj()
+        dco.decompress(data, 1)
+        del data
+        data = zlib.compress(input2)
+        self.assertEqual(dco.flush(), input1[1:])
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,6 +140,9 @@
 Library
 -------
 
+- Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
+  previously-freed memory. Patch by Serhiy Storchaka.
+
 - Issue #16350: zlib.decompressobj().decompress() now accumulates data from
   successive calls after EOF in unused_data, instead of only saving the argument
   to the last call. decompressobj().flush() now correctly sets unused_data and
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -830,6 +830,8 @@
     ENTER_ZLIB
 
     start_total_out = self->zst.total_out;
+    self->zst.avail_in = PyBytes_GET_SIZE(self->unconsumed_tail);
+    self->zst.next_in = (Byte *)PyBytes_AS_STRING(self->unconsumed_tail);
     self->zst.avail_out = length;
     self->zst.next_out = (Byte *)PyString_AS_STRING(retval);
 

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

From python-checkins at python.org  Sun Nov 11 03:20:25 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 03:20:25 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDEx?=
 =?utf-8?q?=3A_Fix_a_bug_where_zlib=2Edecompressobj=28=29=2Eflush=28=29_mi?=
 =?utf-8?q?ght_try_to_access?=
Message-ID: <3Xzf2d5p50zPwQ@mail.python.org>

http://hg.python.org/cpython/rev/a1db815d0829
changeset:   80354:a1db815d0829
branch:      3.2
parent:      80350:85886268c40b
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 03:15:32 2012 +0100
summary:
  Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  12 ++++++++++++
  Misc/NEWS             |   3 +++
  Modules/zlibmodule.c  |   2 ++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -459,6 +459,18 @@
                 self.assertEqual(dco.unconsumed_tail, b'')
                 self.assertEqual(dco.unused_data, remainder)
 
+    def test_flush_with_freed_input(self):
+        # Issue #16411: decompressor accesses input to last decompress() call
+        # in flush(), even if this object has been freed in the meanwhile.
+        input1 = b'abcdefghijklmnopqrstuvwxyz'
+        input2 = b'QWERTYUIOPASDFGHJKLZXCVBNM'
+        data = zlib.compress(input1)
+        dco = zlib.decompressobj()
+        dco.decompress(data, 1)
+        del data
+        data = zlib.compress(input2)
+        self.assertEqual(dco.flush(), input1[1:])
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -159,6 +159,9 @@
 Library
 -------
 
+- Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
+  previously-freed memory. Patch by Serhiy Storchaka.
+
 - Issue #16357: fix calling accept() on a SSLSocket created through
   SSLContext.wrap_socket().  Original patch by Jeff McNeil.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -883,6 +883,8 @@
     ENTER_ZLIB(self);
 
     start_total_out = self->zst.total_out;
+    self->zst.avail_in = PyBytes_GET_SIZE(self->unconsumed_tail);
+    self->zst.next_in = (Byte *)PyBytes_AS_STRING(self->unconsumed_tail);
     self->zst.avail_out = length;
     self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval);
 

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

From python-checkins at python.org  Sun Nov 11 03:20:27 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 03:20:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316411=3A_Fix_a_bug_where_zlib=2Edecompressobj=28=29?=
 =?utf-8?q?=2Eflush=28=29_might_try_to_access?=
Message-ID: <3Xzf2g523QzQ00@mail.python.org>

http://hg.python.org/cpython/rev/a7934fe2927e
changeset:   80355:a7934fe2927e
branch:      3.3
parent:      80351:654eb5163ba1
parent:      80354:a1db815d0829
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 03:16:44 2012 +0100
summary:
  Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  12 ++++++++++++
  Misc/NEWS             |   3 +++
  Modules/zlibmodule.c  |   2 ++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -513,6 +513,18 @@
                 self.assertEqual(dco.unconsumed_tail, b'')
                 self.assertEqual(dco.unused_data, remainder)
 
+    def test_flush_with_freed_input(self):
+        # Issue #16411: decompressor accesses input to last decompress() call
+        # in flush(), even if this object has been freed in the meanwhile.
+        input1 = b'abcdefghijklmnopqrstuvwxyz'
+        input2 = b'QWERTYUIOPASDFGHJKLZXCVBNM'
+        data = zlib.compress(input1)
+        dco = zlib.decompressobj()
+        dco.decompress(data, 1)
+        del data
+        data = zlib.compress(input2)
+        self.assertEqual(dco.flush(), input1[1:])
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,9 @@
 Library
 -------
 
+- Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
+  previously-freed memory. Patch by Serhiy Storchaka.
+
 - Issue #16357: fix calling accept() on a SSLSocket created through
   SSLContext.wrap_socket().  Original patch by Jeff McNeil.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -975,6 +975,8 @@
     ENTER_ZLIB(self);
 
     start_total_out = self->zst.total_out;
+    self->zst.avail_in = PyBytes_GET_SIZE(self->unconsumed_tail);
+    self->zst.next_in = (Byte *)PyBytes_AS_STRING(self->unconsumed_tail);
     self->zst.avail_out = length;
     self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval);
 

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

From python-checkins at python.org  Sun Nov 11 03:20:29 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 03:20:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316411=3A_Fix_a_bug_where_zlib=2Edecompressobj?=
 =?utf-8?q?=28=29=2Eflush=28=29_might_try_to_access?=
Message-ID: <3Xzf2j0HWNzQ3L@mail.python.org>

http://hg.python.org/cpython/rev/d63c751e9f01
changeset:   80356:d63c751e9f01
parent:      80352:4440e45c10f9
parent:      80355:a7934fe2927e
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 03:19:49 2012 +0100
summary:
  Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.

Patch by Serhiy Storchaka.

files:
  Lib/test/test_zlib.py |  12 ++++++++++++
  Misc/NEWS             |   3 +++
  Modules/zlibmodule.c  |   2 ++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -513,6 +513,18 @@
                 self.assertEqual(dco.unconsumed_tail, b'')
                 self.assertEqual(dco.unused_data, remainder)
 
+    def test_flush_with_freed_input(self):
+        # Issue #16411: decompressor accesses input to last decompress() call
+        # in flush(), even if this object has been freed in the meanwhile.
+        input1 = b'abcdefghijklmnopqrstuvwxyz'
+        input2 = b'QWERTYUIOPASDFGHJKLZXCVBNM'
+        data = zlib.compress(input1)
+        dco = zlib.decompressobj()
+        dco.decompress(data, 1)
+        del data
+        data = zlib.compress(input2)
+        self.assertEqual(dco.flush(), input1[1:])
+
     if hasattr(zlib.compressobj(), "copy"):
         def test_compresscopy(self):
             # Test copying a compression object
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,9 @@
 Library
 -------
 
+- Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
+  previously-freed memory. Patch by Serhiy Storchaka.
+
 - Issue #16357: fix calling accept() on a SSLSocket created through
   SSLContext.wrap_socket().  Original patch by Jeff McNeil.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -975,6 +975,8 @@
     ENTER_ZLIB(self);
 
     start_total_out = self->zst.total_out;
+    self->zst.avail_in = PyBytes_GET_SIZE(self->unconsumed_tail);
+    self->zst.next_in = (Byte *)PyBytes_AS_STRING(self->unconsumed_tail);
     self->zst.avail_out = length;
     self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval);
 

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

From python-checkins at python.org  Sun Nov 11 03:28:42 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 03:28:42 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_typo_in_ba?=
 =?utf-8?q?ckporting_fix_of_issue_=2316411_to_2=2E7=2E?=
Message-ID: <3XzfDB5KJyzPsn@mail.python.org>

http://hg.python.org/cpython/rev/be40a10d553a
changeset:   80357:be40a10d553a
branch:      2.7
parent:      80353:c3828831861c
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 03:28:21 2012 +0100
summary:
  Fix typo in backporting fix of issue #16411 to 2.7.

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


diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -830,8 +830,8 @@
     ENTER_ZLIB
 
     start_total_out = self->zst.total_out;
-    self->zst.avail_in = PyBytes_GET_SIZE(self->unconsumed_tail);
-    self->zst.next_in = (Byte *)PyBytes_AS_STRING(self->unconsumed_tail);
+    self->zst.avail_in = PyString_GET_SIZE(self->unconsumed_tail);
+    self->zst.next_in = (Byte *)PyString_AS_STRING(self->unconsumed_tail);
     self->zst.avail_out = length;
     self->zst.next_out = (Byte *)PyString_AS_STRING(retval);
 

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

From python-checkins at python.org  Sun Nov 11 05:34:50 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 05:34:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixes_issue_?=
 =?utf-8?q?=239535=3A_Fix_pending_signals_that_have_been_received_but_not?=
Message-ID: <3Xzj1k373pzQ0L@mail.python.org>

http://hg.python.org/cpython/rev/ba45976c2801
changeset:   80358:ba45976c2801
branch:      3.2
parent:      80354:a1db815d0829
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 20:33:07 2012 -0800
summary:
  Fixes issue #9535: Fix pending signals that have been received but not
yet handled by Python to not persist after os.fork() in the child process.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9535: Fix pending signals that have been received but not yet
+  handled by Python to not persist after os.fork() in the child process.
+
 - Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
   Stinner.
 
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -987,9 +987,25 @@
     return 0;
 }
 
+static void
+_clear_pending_signals(void)
+{
+    int i;
+    if (!is_tripped)
+        return;
+    is_tripped = 0;
+    for (i = 1; i < NSIG; ++i) {
+        Handlers[i].tripped = 0;
+    }
+}
+
 void
 PyOS_AfterFork(void)
 {
+    /* Clear the signal flags after forking so that they aren't handled
+     * in both processes if they came in just before the fork() but before
+     * the interpreter had an opportunity to call the handlers.  issue9535. */
+    _clear_pending_signals();
 #ifdef WITH_THREAD
     /* PyThread_ReInitTLS() must be called early, to make sure that the TLS API
      * can be called safely. */

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

From python-checkins at python.org  Sun Nov 11 05:34:51 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 05:34:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Fixes_issue_=239535=3A_Fix_pending_signals_that_have_been_rece?=
 =?utf-8?q?ived_but_not?=
Message-ID: <3Xzj1l5kMJzQ3S@mail.python.org>

http://hg.python.org/cpython/rev/c7d6cd3c27b9
changeset:   80359:c7d6cd3c27b9
branch:      3.3
parent:      80355:a7934fe2927e
parent:      80358:ba45976c2801
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 20:33:39 2012 -0800
summary:
  Fixes issue #9535: Fix pending signals that have been received but not
yet handled by Python to not persist after os.fork() in the child process.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9535: Fix pending signals that have been received but not yet
+  handled by Python to not persist after os.fork() in the child process.
+
 - Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
   Stinner.
 
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -1394,9 +1394,25 @@
     return 0;
 }
 
+static void
+_clear_pending_signals(void)
+{
+    int i;
+    if (!is_tripped)
+        return;
+    is_tripped = 0;
+    for (i = 1; i < NSIG; ++i) {
+        Handlers[i].tripped = 0;
+    }
+}
+
 void
 PyOS_AfterFork(void)
 {
+    /* Clear the signal flags after forking so that they aren't handled
+     * in both processes if they came in just before the fork() but before
+     * the interpreter had an opportunity to call the handlers.  issue9535. */
+    _clear_pending_signals();
 #ifdef WITH_THREAD
     /* PyThread_ReInitTLS() must be called early, to make sure that the TLS API
      * can be called safely. */

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

From python-checkins at python.org  Sun Nov 11 05:34:53 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 05:34:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fixes_issue_=239535=3A_Fix_pending_signals_that_have_bee?=
 =?utf-8?q?n_received_but_not?=
Message-ID: <3Xzj1n0ylWzQ3l@mail.python.org>

http://hg.python.org/cpython/rev/41280973921a
changeset:   80360:41280973921a
parent:      80356:d63c751e9f01
parent:      80359:c7d6cd3c27b9
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 20:34:41 2012 -0800
summary:
  Fixes issue #9535: Fix pending signals that have been received but not
yet handled by Python to not persist after os.fork() in the child process.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9535: Fix pending signals that have been received but not yet
+  handled by Python to not persist after os.fork() in the child process.
+
 - Issue #14794: Fix slice.indices to return correct results for huge values,
   rather than raising OverflowError.
 
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -1389,9 +1389,25 @@
     return 0;
 }
 
+static void
+_clear_pending_signals(void)
+{
+    int i;
+    if (!is_tripped)
+        return;
+    is_tripped = 0;
+    for (i = 1; i < NSIG; ++i) {
+        Handlers[i].tripped = 0;
+    }
+}
+
 void
 PyOS_AfterFork(void)
 {
+    /* Clear the signal flags after forking so that they aren't handled
+     * in both processes if they came in just before the fork() but before
+     * the interpreter had an opportunity to call the handlers.  issue9535. */
+    _clear_pending_signals();
 #ifdef WITH_THREAD
     /* PyThread_ReInitTLS() must be called early, to make sure that the TLS API
      * can be called safely. */

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

From python-checkins at python.org  Sun Nov 11 05:38:30 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 05:38:30 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fixes_issue_?=
 =?utf-8?q?=239535=3A_Fix_pending_signals_that_have_been_received_but_not_?=
 =?utf-8?q?yet?=
Message-ID: <3Xzj5y0hZ7zQ1R@mail.python.org>

http://hg.python.org/cpython/rev/9b711422c98f
changeset:   80361:9b711422c98f
branch:      2.7
parent:      80357:be40a10d553a
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 20:38:17 2012 -0800
summary:
  Fixes issue #9535: Fix pending signals that have been received but not yet
handled by Python to not persist after os.fork() in the child process.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9535: Fix pending signals that have been received but not yet
+  handled by Python to not persist after os.fork() in the child process.
+
 - Issue #15001: fix segfault on "del sys.modules['__main__']". Patch by Victor
   Stinner.
 
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -972,9 +972,25 @@
     return 0;
 }
 
+static void
+_clear_pending_signals(void)
+{
+    int i;
+    if (!is_tripped)
+        return;
+    is_tripped = 0;
+    for (i = 1; i < NSIG; ++i) {
+        Handlers[i].tripped = 0;
+    }
+}
+
 void
 PyOS_AfterFork(void)
 {
+    /* Clear the signal flags after forking so that they aren't handled
+     * in both processes if they came in just before the fork() but before
+     * the interpreter had an opportunity to call the handlers.  issue9535. */
+    _clear_pending_signals();
 #ifdef WITH_THREAD
     /* PyThread_ReInitTLS() must be called early, to make sure that the TLS API
      * can be called safely. */

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

From solipsis at pitrou.net  Sun Nov 11 05:55:57 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 11 Nov 2012 05:55:57 +0100
Subject: [Python-checkins] Daily reference leaks (d63c751e9f01): sum=0
Message-ID: <E1TXPaP-0007jz-Eo@ap.vmr.nerim.net>

results for d63c751e9f01 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Sun Nov 11 06:10:40 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 06:10:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixes_issue_?=
 =?utf-8?q?=2314396=3A_Handle_the_odd_rare_case_of_waitpid_returning_0_whe?=
 =?utf-8?q?n?=
Message-ID: <3Xzjq42pbWzPyD@mail.python.org>

http://hg.python.org/cpython/rev/d478df13abde
changeset:   80362:d478df13abde
branch:      3.2
parent:      80358:ba45976c2801
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 20:52:29 2012 -0800
summary:
  Fixes issue #14396: Handle the odd rare case of waitpid returning 0 when
not expected in subprocess.Popen.wait().

files:
  Lib/subprocess.py |  8 ++++++--
  Misc/NEWS         |  3 +++
  2 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1428,7 +1428,7 @@
         def wait(self):
             """Wait for child process to terminate.  Returns returncode
             attribute."""
-            if self.returncode is None:
+            while self.returncode is None:
                 try:
                     pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0)
                 except OSError as e:
@@ -1437,8 +1437,12 @@
                     # 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.
+                    pid = self.pid
                     sts = 0
-                self._handle_exitstatus(sts)
+                # Check the pid and loop as waitpid has been known to return
+                # 0 even without WNOHANG in odd situations.  issue14396.
+                if pid == self.pid:
+                    self._handle_exitstatus(sts)
             return self.returncode
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #14396: Handle the odd rare case of waitpid returning 0 when not
+  expected in subprocess.Popen.wait().
+
 - Issue #9535: Fix pending signals that have been received but not yet
   handled by Python to not persist after os.fork() in the child process.
 

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

From python-checkins at python.org  Sun Nov 11 06:10:41 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 06:10:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Fixes_issue_=2314396=3A_Handle_the_odd_rare_case_of_waitpid_re?=
 =?utf-8?q?turning_0?=
Message-ID: <3Xzjq55V64zQ2M@mail.python.org>

http://hg.python.org/cpython/rev/61a0eace0f2e
changeset:   80363:61a0eace0f2e
branch:      3.3
parent:      80359:c7d6cd3c27b9
parent:      80362:d478df13abde
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 21:06:18 2012 -0800
summary:
  Fixes issue #14396: Handle the odd rare case of waitpid returning 0
when not expected in subprocess.Popen.wait().

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


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1509,9 +1509,13 @@
                         raise TimeoutExpired(self.args, timeout)
                     delay = min(delay * 2, remaining, .05)
                     time.sleep(delay)
-            elif self.returncode is None:
-                (pid, sts) = self._try_wait(0)
-                self._handle_exitstatus(sts)
+            else:
+                while self.returncode is None:
+                    (pid, sts) = self._try_wait(0)
+                    # Check the pid and loop as waitpid has been known to return
+                    # 0 even without WNOHANG in odd situations.  issue14396.
+                    if pid == self.pid:
+                        self._handle_exitstatus(sts)
             return self.returncode
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@
 Library
 -------
 
+- Issue #14396: Handle the odd rare case of waitpid returning 0 when not
+  expected in subprocess.Popen.wait().
+
 - Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
   previously-freed memory. Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Sun Nov 11 06:10:43 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 06:10:43 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_move_note_to_t?=
	=?utf-8?q?he_right_section?=
Message-ID: <3Xzjq70pM7zQ4k@mail.python.org>

http://hg.python.org/cpython/rev/e1421b8e1518
changeset:   80364:e1421b8e1518
branch:      3.2
parent:      80362:d478df13abde
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 21:07:04 2012 -0800
summary:
  move note to the right section

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,9 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #14396: Handle the odd rare case of waitpid returning 0 when not
-  expected in subprocess.Popen.wait().
-
 - Issue #9535: Fix pending signals that have been received but not yet
   handled by Python to not persist after os.fork() in the child process.
 
@@ -165,6 +162,9 @@
 Library
 -------
 
+- Issue #14396: Handle the odd rare case of waitpid returning 0 when not
+  expected in subprocess.Popen.wait().
+
 - Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
   previously-freed memory. Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Sun Nov 11 06:10:44 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 06:10:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
	=?utf-8?q?_null_merge?=
Message-ID: <3Xzjq838JmzQ3l@mail.python.org>

http://hg.python.org/cpython/rev/80adde16cc94
changeset:   80365:80adde16cc94
branch:      3.3
parent:      80363:61a0eace0f2e
parent:      80364:e1421b8e1518
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 21:08:35 2012 -0800
summary:
  null merge

files:



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

From python-checkins at python.org  Sun Nov 11 06:10:45 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 06:10:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fixes_issue_=2314396=3A_Handle_the_odd_rare_case_of_wait?=
 =?utf-8?q?pid_returning_0?=
Message-ID: <3Xzjq95lY7zQ6H@mail.python.org>

http://hg.python.org/cpython/rev/512c1120332f
changeset:   80366:512c1120332f
parent:      80360:41280973921a
parent:      80365:80adde16cc94
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 21:10:31 2012 -0800
summary:
  Fixes issue #14396: Handle the odd rare case of waitpid returning 0
when not expected in subprocess.Popen.wait().

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


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1509,9 +1509,13 @@
                         raise TimeoutExpired(self.args, timeout)
                     delay = min(delay * 2, remaining, .05)
                     time.sleep(delay)
-            elif self.returncode is None:
-                (pid, sts) = self._try_wait(0)
-                self._handle_exitstatus(sts)
+            else:
+                while self.returncode is None:
+                    (pid, sts) = self._try_wait(0)
+                    # Check the pid and loop as waitpid has been known to return
+                    # 0 even without WNOHANG in odd situations.  issue14396.
+                    if pid == self.pid:
+                        self._handle_exitstatus(sts)
             return self.returncode
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,9 @@
 Library
 -------
 
+- Issue #14396: Handle the odd rare case of waitpid returning 0 when not
+  expected in subprocess.Popen.wait().
+
 - Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
   previously-freed memory. Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Sun Nov 11 06:13:37 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 06:13:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fixes_issue_?=
 =?utf-8?q?=2314396=3A_Handle_the_odd_rare_case_of_waitpid_returning_0?=
Message-ID: <3XzjtT35d2zPyD@mail.python.org>

http://hg.python.org/cpython/rev/82711f5ab507
changeset:   80367:82711f5ab507
branch:      2.7
parent:      80361:9b711422c98f
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 21:13:20 2012 -0800
summary:
  Fixes issue #14396: Handle the odd rare case of waitpid returning 0
when not expected in subprocess.Popen.wait().

files:
  Lib/subprocess.py |  8 ++++++--
  Misc/NEWS         |  3 +++
  2 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1303,7 +1303,7 @@
         def wait(self):
             """Wait for child process to terminate.  Returns returncode
             attribute."""
-            if self.returncode is None:
+            while self.returncode is None:
                 try:
                     pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0)
                 except OSError as e:
@@ -1312,8 +1312,12 @@
                     # 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.
+                    pid = self.pid
                     sts = 0
-                self._handle_exitstatus(sts)
+                # Check the pid and loop as waitpid has been known to return
+                # 0 even without WNOHANG in odd situations.  issue14396.
+                if pid == self.pid:
+                    self._handle_exitstatus(sts)
             return self.returncode
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #14396: Handle the odd rare case of waitpid returning 0 when not
+  expected in subprocess.Popen.wait().
+
 - Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access
   previously-freed memory. Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Sun Nov 11 07:34:27 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 07:34:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixes_issue_?=
 =?utf-8?q?=2316327=3A_The_subprocess_module_no_longer_leaks_file_descript?=
 =?utf-8?q?ors?=
Message-ID: <3Xzlgl6KCSzQ3Z@mail.python.org>

http://hg.python.org/cpython/rev/63ff4c9a2ed2
changeset:   80368:63ff4c9a2ed2
branch:      3.2
parent:      80364:e1421b8e1518
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 22:32:22 2012 -0800
summary:
  Fixes issue #16327: The subprocess module no longer leaks file descriptors
used for stdin/stdout/stderr pipes to the child when fork() fails.

files:
  Lib/subprocess.py           |  20 ++++++++++++--
  Lib/test/test_subprocess.py |  33 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 ++
  3 files changed, 53 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -744,13 +744,27 @@
                                 errread, errwrite,
                                 restore_signals, start_new_session)
         except:
-            # Cleanup if the child failed starting
-            for f in filter(None, [self.stdin, self.stdout, self.stderr]):
+            # Cleanup if the child failed starting.
+            for f in filter(None, (self.stdin, self.stdout, self.stderr)):
                 try:
                     f.close()
                 except EnvironmentError:
-                    # Ignore EBADF or other errors
+                    pass  # Ignore EBADF or other errors.
+
+            # Make sure the child pipes are closed as well.
+            to_close = []
+            if stdin == PIPE:
+                to_close.append(p2cread)
+            if stdout == PIPE:
+                to_close.append(c2pwrite)
+            if stderr == PIPE:
+                to_close.append(errwrite)
+            for fd in to_close:
+                try:
+                    os.close(fd)
+                except EnvironmentError:
                     pass
+
             raise
 
 
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
@@ -65,6 +65,18 @@
         self.assertEqual(actual, expected, msg)
 
 
+class PopenTestException(Exception):
+    pass
+
+
+class PopenExecuteChildRaises(subprocess.Popen):
+    """Popen subclass for testing cleanup of subprocess.PIPE filehandles when
+    _execute_child fails.
+    """
+    def _execute_child(self, *args, **kwargs):
+        raise PopenTestException("Forced Exception for Test")
+
+
 class ProcessTestCase(BaseTestCase):
 
     def test_call_seq(self):
@@ -841,6 +853,27 @@
                 process.communicate()
 
 
+    # This test is Linux-ish specific for simplicity to at least have
+    # some coverage.  It is not a platform specific bug.
+    @unittest.skipUnless(os.path.isdir('/proc/%d/fd' % os.getpid()),
+                         "Linux specific")
+    def test_failed_child_execute_fd_leak(self):
+        """Test for the fork() failure fd leak reported in issue16327."""
+        fd_directory = '/proc/%d/fd' % os.getpid()
+        fds_before_popen = os.listdir(fd_directory)
+        with self.assertRaises(PopenTestException):
+            PopenExecuteChildRaises(
+                    [sys.executable, '-c', 'pass'], stdin=subprocess.PIPE,
+                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        # NOTE: This test doesn't verify that the real _execute_child
+        # does not close the file descriptors itself on the way out
+        # during an exception.  Code inspection has confirmed that.
+
+        fds_after_exception = os.listdir(fd_directory)
+        self.assertEqual(fds_before_popen, fds_after_exception)
+
+
 # context manager
 class _SuppressCoreFiles(object):
     """Try to prevent core files from being created."""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -162,6 +162,9 @@
 Library
 -------
 
+- Issue #16327: The subprocess module no longer leaks file descriptors
+  used for stdin/stdout/stderr pipes to the child when fork() fails.
+
 - Issue #14396: Handle the odd rare case of waitpid returning 0 when not
   expected in subprocess.Popen.wait().
 

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

From python-checkins at python.org  Sun Nov 11 07:34:29 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 07:34:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Fixes_issue_=2316327=3A_The_subprocess_module_no_longer_leaks_?=
 =?utf-8?q?file_descriptors?=
Message-ID: <3Xzlgn30QLzQ6H@mail.python.org>

http://hg.python.org/cpython/rev/a6a6c349af7e
changeset:   80369:a6a6c349af7e
branch:      3.3
parent:      80365:80adde16cc94
parent:      80368:63ff4c9a2ed2
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 22:33:23 2012 -0800
summary:
  Fixes issue #16327: The subprocess module no longer leaks file descriptors
used for stdin/stdout/stderr pipes to the child when fork() fails.

files:
  Lib/subprocess.py           |  20 ++++++++++++--
  Lib/test/test_subprocess.py |  33 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 ++
  3 files changed, 53 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -817,13 +817,27 @@
                                 errread, errwrite,
                                 restore_signals, start_new_session)
         except:
-            # Cleanup if the child failed starting
-            for f in filter(None, [self.stdin, self.stdout, self.stderr]):
+            # Cleanup if the child failed starting.
+            for f in filter(None, (self.stdin, self.stdout, self.stderr)):
                 try:
                     f.close()
                 except EnvironmentError:
-                    # Ignore EBADF or other errors
+                    pass  # Ignore EBADF or other errors.
+
+            # Make sure the child pipes are closed as well.
+            to_close = []
+            if stdin == PIPE:
+                to_close.append(p2cread)
+            if stdout == PIPE:
+                to_close.append(c2pwrite)
+            if stderr == PIPE:
+                to_close.append(errwrite)
+            for fd in to_close:
+                try:
+                    os.close(fd)
+                except EnvironmentError:
                     pass
+
             raise
 
 
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
@@ -68,6 +68,18 @@
         self.assertEqual(actual, expected, msg)
 
 
+class PopenTestException(Exception):
+    pass
+
+
+class PopenExecuteChildRaises(subprocess.Popen):
+    """Popen subclass for testing cleanup of subprocess.PIPE filehandles when
+    _execute_child fails.
+    """
+    def _execute_child(self, *args, **kwargs):
+        raise PopenTestException("Forced Exception for Test")
+
+
 class ProcessTestCase(BaseTestCase):
 
     def test_call_seq(self):
@@ -995,6 +1007,27 @@
                 process.communicate()
 
 
+    # This test is Linux-ish specific for simplicity to at least have
+    # some coverage.  It is not a platform specific bug.
+    @unittest.skipUnless(os.path.isdir('/proc/%d/fd' % os.getpid()),
+                         "Linux specific")
+    def test_failed_child_execute_fd_leak(self):
+        """Test for the fork() failure fd leak reported in issue16327."""
+        fd_directory = '/proc/%d/fd' % os.getpid()
+        fds_before_popen = os.listdir(fd_directory)
+        with self.assertRaises(PopenTestException):
+            PopenExecuteChildRaises(
+                    [sys.executable, '-c', 'pass'], stdin=subprocess.PIPE,
+                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        # NOTE: This test doesn't verify that the real _execute_child
+        # does not close the file descriptors itself on the way out
+        # during an exception.  Code inspection has confirmed that.
+
+        fds_after_exception = os.listdir(fd_directory)
+        self.assertEqual(fds_before_popen, fds_after_exception)
+
+
 # context manager
 class _SuppressCoreFiles(object):
     """Try to prevent core files from being created."""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@
 Library
 -------
 
+- Issue #16327: The subprocess module no longer leaks file descriptors
+  used for stdin/stdout/stderr pipes to the child when fork() fails.
+
 - Issue #14396: Handle the odd rare case of waitpid returning 0 when not
   expected in subprocess.Popen.wait().
 

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

From python-checkins at python.org  Sun Nov 11 07:34:30 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 07:34:30 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fixes_issue_=2316327=3A_The_subprocess_module_no_longer_?=
 =?utf-8?q?leaks_file_descriptors?=
Message-ID: <3Xzlgp6fPWzQ86@mail.python.org>

http://hg.python.org/cpython/rev/a9e238168588
changeset:   80370:a9e238168588
parent:      80366:512c1120332f
parent:      80369:a6a6c349af7e
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 22:34:18 2012 -0800
summary:
  Fixes issue #16327: The subprocess module no longer leaks file descriptors
used for stdin/stdout/stderr pipes to the child when fork() fails.

files:
  Lib/subprocess.py           |  20 ++++++++++++--
  Lib/test/test_subprocess.py |  33 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 ++
  3 files changed, 53 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -817,13 +817,27 @@
                                 errread, errwrite,
                                 restore_signals, start_new_session)
         except:
-            # Cleanup if the child failed starting
-            for f in filter(None, [self.stdin, self.stdout, self.stderr]):
+            # Cleanup if the child failed starting.
+            for f in filter(None, (self.stdin, self.stdout, self.stderr)):
                 try:
                     f.close()
                 except EnvironmentError:
-                    # Ignore EBADF or other errors
+                    pass  # Ignore EBADF or other errors.
+
+            # Make sure the child pipes are closed as well.
+            to_close = []
+            if stdin == PIPE:
+                to_close.append(p2cread)
+            if stdout == PIPE:
+                to_close.append(c2pwrite)
+            if stderr == PIPE:
+                to_close.append(errwrite)
+            for fd in to_close:
+                try:
+                    os.close(fd)
+                except EnvironmentError:
                     pass
+
             raise
 
 
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
@@ -68,6 +68,18 @@
         self.assertEqual(actual, expected, msg)
 
 
+class PopenTestException(Exception):
+    pass
+
+
+class PopenExecuteChildRaises(subprocess.Popen):
+    """Popen subclass for testing cleanup of subprocess.PIPE filehandles when
+    _execute_child fails.
+    """
+    def _execute_child(self, *args, **kwargs):
+        raise PopenTestException("Forced Exception for Test")
+
+
 class ProcessTestCase(BaseTestCase):
 
     def test_call_seq(self):
@@ -995,6 +1007,27 @@
                 process.communicate()
 
 
+    # This test is Linux-ish specific for simplicity to at least have
+    # some coverage.  It is not a platform specific bug.
+    @unittest.skipUnless(os.path.isdir('/proc/%d/fd' % os.getpid()),
+                         "Linux specific")
+    def test_failed_child_execute_fd_leak(self):
+        """Test for the fork() failure fd leak reported in issue16327."""
+        fd_directory = '/proc/%d/fd' % os.getpid()
+        fds_before_popen = os.listdir(fd_directory)
+        with self.assertRaises(PopenTestException):
+            PopenExecuteChildRaises(
+                    [sys.executable, '-c', 'pass'], stdin=subprocess.PIPE,
+                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        # NOTE: This test doesn't verify that the real _execute_child
+        # does not close the file descriptors itself on the way out
+        # during an exception.  Code inspection has confirmed that.
+
+        fds_after_exception = os.listdir(fd_directory)
+        self.assertEqual(fds_before_popen, fds_after_exception)
+
+
 # context manager
 class _SuppressCoreFiles(object):
     """Try to prevent core files from being created."""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,9 @@
 Library
 -------
 
+- Issue #16327: The subprocess module no longer leaks file descriptors
+  used for stdin/stdout/stderr pipes to the child when fork() fails.
+
 - Issue #14396: Handle the odd rare case of waitpid returning 0 when not
   expected in subprocess.Popen.wait().
 

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

From python-checkins at python.org  Sun Nov 11 07:49:17 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 07:49:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fixes_issue_?=
 =?utf-8?q?=2316327=3A_The_subprocess_module_no_longer_leaks_file_descript?=
 =?utf-8?q?ors?=
Message-ID: <3Xzm0s5ctxzQ8B@mail.python.org>

http://hg.python.org/cpython/rev/e67620048d2f
changeset:   80371:e67620048d2f
branch:      2.7
parent:      80367:82711f5ab507
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 22:49:03 2012 -0800
summary:
  Fixes issue #16327: The subprocess module no longer leaks file descriptors
used for stdin/stdout/stderr pipes to the child when fork() fails.

files:
  Lib/subprocess.py           |  33 ++++++++++++++++++++----
  Lib/test/test_subprocess.py |  33 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 ++
  3 files changed, 63 insertions(+), 6 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -671,12 +671,33 @@
          c2pread, c2pwrite,
          errread, errwrite) = self._get_handles(stdin, stdout, stderr)
 
-        self._execute_child(args, executable, preexec_fn, close_fds,
-                            cwd, env, universal_newlines,
-                            startupinfo, creationflags, shell,
-                            p2cread, p2cwrite,
-                            c2pread, c2pwrite,
-                            errread, errwrite)
+        try:
+            self._execute_child(args, executable, preexec_fn, close_fds,
+                                cwd, env, universal_newlines,
+                                startupinfo, creationflags, shell,
+                                p2cread, p2cwrite,
+                                c2pread, c2pwrite,
+                                errread, errwrite)
+        except Exception:
+            # Preserve original exception in case os.close raises.
+            exc_type, exc_value, exc_trace = sys.exc_info()
+
+            to_close = []
+            # Only close the pipes we created.
+            if stdin == PIPE:
+                to_close.extend((p2cread, p2cwrite))
+            if stdout == PIPE:
+                to_close.extend((c2pread, c2pwrite))
+            if stderr == PIPE:
+                to_close.extend((errread, errwrite))
+
+            for fd in to_close:
+                try:
+                    os.close(fd)
+                except EnvironmentError:
+                    pass
+
+            raise exc_type, exc_value, exc_trace
 
         if mswindows:
             if p2cwrite is not None:
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
@@ -58,6 +58,18 @@
         self.assertEqual(actual, expected, msg)
 
 
+class PopenTestException(Exception):
+    pass
+
+
+class PopenExecuteChildRaises(subprocess.Popen):
+    """Popen subclass for testing cleanup of subprocess.PIPE filehandles when
+    _execute_child fails.
+    """
+    def _execute_child(self, *args, **kwargs):
+        raise PopenTestException("Forced Exception for Test")
+
+
 class ProcessTestCase(BaseTestCase):
 
     def test_call_seq(self):
@@ -632,6 +644,27 @@
         time.sleep(2)
         p.communicate("x" * 2**20)
 
+    # This test is Linux-ish specific for simplicity to at least have
+    # some coverage.  It is not a platform specific bug.
+    @unittest.skipUnless(os.path.isdir('/proc/%d/fd' % os.getpid()),
+                         "Linux specific")
+    def test_failed_child_execute_fd_leak(self):
+        """Test for the fork() failure fd leak reported in issue16327."""
+        fd_directory = '/proc/%d/fd' % os.getpid()
+        fds_before_popen = os.listdir(fd_directory)
+        with self.assertRaises(PopenTestException):
+            PopenExecuteChildRaises(
+                    [sys.executable, '-c', 'pass'], stdin=subprocess.PIPE,
+                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        # NOTE: This test doesn't verify that the real _execute_child
+        # does not close the file descriptors itself on the way out
+        # during an exception.  Code inspection has confirmed that.
+
+        fds_after_exception = os.listdir(fd_directory)
+        self.assertEqual(fds_before_popen, fds_after_exception)
+
+
 # context manager
 class _SuppressCoreFiles(object):
     """Try to prevent core files from being created."""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 Library
 -------
 
+- Issue #16327: The subprocess module no longer leaks file descriptors
+  used for stdin/stdout/stderr pipes to the child when fork() fails.
+
 - Issue #14396: Handle the odd rare case of waitpid returning 0 when not
   expected in subprocess.Popen.wait().
 

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

From python-checkins at python.org  Sun Nov 11 08:35:21 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 08:35:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Rename_a_local?=
 =?utf-8?q?_variable_for_readability_and_change_a_=22this_can=27t?=
Message-ID: <3Xzn215HHNzPwQ@mail.python.org>

http://hg.python.org/cpython/rev/99c63578f932
changeset:   80372:99c63578f932
branch:      3.2
parent:      80368:63ff4c9a2ed2
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 23:33:17 2012 -0800
summary:
  Rename a local variable for readability and change a "this can't
happen" print() call into a RuntimeWarning as it should've been in the
first place.  Because nothing should ever cause unexpected stdout output.

files:
  Lib/subprocess.py |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1351,26 +1351,28 @@
 
                 # Wait for exec to fail or succeed; possibly raising an
                 # exception (limited in size)
-                data = bytearray()
+                errpipe_data = bytearray()
                 while True:
                     part = _eintr_retry_call(os.read, errpipe_read, 50000)
-                    data += part
-                    if not part or len(data) > 50000:
+                    errpipe_data += part
+                    if not part or len(errpipe_data) > 50000:
                         break
             finally:
                 # be sure the FD is closed no matter what
                 os.close(errpipe_read)
 
-            if data:
+            if errpipe_data:
                 try:
                     _eintr_retry_call(os.waitpid, self.pid, 0)
                 except OSError as e:
                     if e.errno != errno.ECHILD:
                         raise
                 try:
-                    exception_name, hex_errno, err_msg = data.split(b':', 2)
+                    exception_name, hex_errno, err_msg = (
+                            errpipe_data.split(b':', 2))
                 except ValueError:
-                    print('Bad exception data:', repr(data))
+                    warnings.warn(RuntimeWarning(
+                            'Bad exception data: %r' % errpipe_data))
                     exception_name = b'RuntimeError'
                     hex_errno = b'0'
                     err_msg = b'Unknown'

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

From python-checkins at python.org  Sun Nov 11 08:35:23 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 08:35:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Rename_a_local_variable_for_readability_and_change_a_=22this_c?=
 =?utf-8?q?an=27t?=
Message-ID: <3Xzn230XJwzPwQ@mail.python.org>

http://hg.python.org/cpython/rev/fd45ae32d12f
changeset:   80373:fd45ae32d12f
branch:      3.3
parent:      80369:a6a6c349af7e
parent:      80372:99c63578f932
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 23:33:56 2012 -0800
summary:
  Rename a local variable for readability and change a "this can't
happen" print() call into a RuntimeWarning as it should've been in the
first place.  Because nothing should ever cause unexpected stdout output.

files:
  Lib/subprocess.py |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1392,26 +1392,28 @@
 
                 # Wait for exec to fail or succeed; possibly raising an
                 # exception (limited in size)
-                data = bytearray()
+                errpipe_data = bytearray()
                 while True:
                     part = _eintr_retry_call(os.read, errpipe_read, 50000)
-                    data += part
-                    if not part or len(data) > 50000:
+                    errpipe_data += part
+                    if not part or len(errpipe_data) > 50000:
                         break
             finally:
                 # be sure the FD is closed no matter what
                 os.close(errpipe_read)
 
-            if data:
+            if errpipe_data:
                 try:
                     _eintr_retry_call(os.waitpid, self.pid, 0)
                 except OSError as e:
                     if e.errno != errno.ECHILD:
                         raise
                 try:
-                    exception_name, hex_errno, err_msg = data.split(b':', 2)
+                    exception_name, hex_errno, err_msg = (
+                            errpipe_data.split(b':', 2))
                 except ValueError:
-                    print('Bad exception data:', repr(data))
+                    warnings.warn(RuntimeWarning(
+                            'Bad exception data: %r' % errpipe_data))
                     exception_name = b'RuntimeError'
                     hex_errno = b'0'
                     err_msg = b'Unknown'

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

From python-checkins at python.org  Sun Nov 11 08:35:24 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 08:35:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Rename_a_local_variable_for_readability_and_change_a_=22?=
 =?utf-8?q?this_can=27t?=
Message-ID: <3Xzn2438JzzQ1p@mail.python.org>

http://hg.python.org/cpython/rev/aa91e5534717
changeset:   80374:aa91e5534717
parent:      80370:a9e238168588
parent:      80373:fd45ae32d12f
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 23:35:15 2012 -0800
summary:
  Rename a local variable for readability and change a "this can't
happen" print() call into a RuntimeWarning as it should've been in the
first place.  Because nothing should ever cause unexpected stdout output.

files:
  Lib/subprocess.py |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1392,26 +1392,28 @@
 
                 # Wait for exec to fail or succeed; possibly raising an
                 # exception (limited in size)
-                data = bytearray()
+                errpipe_data = bytearray()
                 while True:
                     part = _eintr_retry_call(os.read, errpipe_read, 50000)
-                    data += part
-                    if not part or len(data) > 50000:
+                    errpipe_data += part
+                    if not part or len(errpipe_data) > 50000:
                         break
             finally:
                 # be sure the FD is closed no matter what
                 os.close(errpipe_read)
 
-            if data:
+            if errpipe_data:
                 try:
                     _eintr_retry_call(os.waitpid, self.pid, 0)
                 except OSError as e:
                     if e.errno != errno.ECHILD:
                         raise
                 try:
-                    exception_name, hex_errno, err_msg = data.split(b':', 2)
+                    exception_name, hex_errno, err_msg = (
+                            errpipe_data.split(b':', 2))
                 except ValueError:
-                    print('Bad exception data:', repr(data))
+                    warnings.warn(RuntimeWarning(
+                            'Bad exception data: %r' % errpipe_data))
                     exception_name = b'RuntimeError'
                     hex_errno = b'0'
                     err_msg = b'Unknown'

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

From python-checkins at python.org  Sun Nov 11 08:53:55 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 08:53:55 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Raise_our_own_SubprocessEr?=
 =?utf-8?q?ror_rather_than_a_RuntimeError_in_when_dealing_with?=
Message-ID: <3XznRR2lsXzPg9@mail.python.org>

http://hg.python.org/cpython/rev/9180fb4eccc7
changeset:   80375:9180fb4eccc7
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Nov 10 23:53:47 2012 -0800
summary:
  Raise our own SubprocessError rather than a RuntimeError in when dealing with
odd rare errors coming from the subprocess module.

files:
  Lib/subprocess.py           |  12 ++++++------
  Lib/test/test_subprocess.py |   6 +++---
  Misc/NEWS                   |   3 +++
  Modules/_posixsubprocess.c  |   2 +-
  4 files changed, 13 insertions(+), 10 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1042,9 +1042,9 @@
                 w9xpopen = os.path.join(os.path.dirname(sys.base_exec_prefix),
                                         "w9xpopen.exe")
                 if not os.path.exists(w9xpopen):
-                    raise RuntimeError("Cannot locate w9xpopen.exe, which is "
-                                       "needed for Popen to work with your "
-                                       "shell or platform.")
+                    raise SubprocessError(
+                            "Cannot locate w9xpopen.exe, which is needed for "
+                            "Popen to work with your shell or platform.")
             return w9xpopen
 
 
@@ -1414,12 +1414,12 @@
                 except ValueError:
                     warnings.warn(RuntimeWarning(
                             'Bad exception data: %r' % errpipe_data))
-                    exception_name = b'RuntimeError'
+                    exception_name = b'SubprocessError'
                     hex_errno = b'0'
                     err_msg = b'Unknown'
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
-                        RuntimeError)
+                        SubprocessError)
                 for fd in (p2cwrite, c2pread, errread):
                     if fd != -1:
                         os.close(fd)
@@ -1452,7 +1452,7 @@
                 self.returncode = _WEXITSTATUS(sts)
             else:
                 # Should never happen
-                raise RuntimeError("Unknown child exit status!")
+                raise SubprocessError("Unknown child exit status!")
 
 
         def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,
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
@@ -1179,7 +1179,7 @@
         try:
             p = subprocess.Popen([sys.executable, "-c", ""],
                                  preexec_fn=raise_it)
-        except RuntimeError as e:
+        except subprocess.SubprocessError as e:
             self.assertTrue(
                     subprocess._posixsubprocess,
                     "Expected a ValueError from the preexec_fn")
@@ -1544,12 +1544,12 @@
             # Pure Python implementations keeps the message
             self.assertIsNone(subprocess._posixsubprocess)
             self.assertEqual(str(err), "surrogate:\uDCff")
-        except RuntimeError as err:
+        except subprocess.SubprocessError as err:
             # _posixsubprocess uses a default message
             self.assertIsNotNone(subprocess._posixsubprocess)
             self.assertEqual(str(err), "Exception occurred in preexec_fn.")
         else:
-            self.fail("Expected ValueError or RuntimeError")
+            self.fail("Expected ValueError or subprocess.SubprocessError")
 
     def test_undecodable_env(self):
         for key, value in (('test', 'abc\uDCFF'), ('test\uDCFF', '42')):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,9 @@
 Library
 -------
 
+- The subprocess module now raises its own SubprocessError instead of a
+  RuntimeError in various error situations which should not normally happen.
+
 - Issue #16327: The subprocess module no longer leaks file descriptors
   used for stdin/stdout/stderr pipes to the child when fork() fails.
 
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -497,7 +497,7 @@
         /* We can't call strerror(saved_errno).  It is not async signal safe.
          * The parent process will look the error message up. */
     } else {
-        unused = write(errpipe_write, "RuntimeError:0:", 15);
+        unused = write(errpipe_write, "SubprocessError:0:", 18);
         unused = write(errpipe_write, err_msg, strlen(err_msg));
     }
     if (unused) return;  /* silly? yes! avoids gcc compiler warning. */

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

From python-checkins at python.org  Sun Nov 11 09:08:58 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 09:08:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Remove_the_sub?=
 =?utf-8?q?process_=22bad_exception_data=22_warning_=28formerly_a_print!?=
 =?utf-8?q?=29?=
Message-ID: <3Xznmp3c46zQ3g@mail.python.org>

http://hg.python.org/cpython/rev/bbfff05ed34f
changeset:   80376:bbfff05ed34f
branch:      3.2
parent:      80372:99c63578f932
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 00:04:13 2012 -0800
summary:
  Remove the subprocess "bad exception data" warning (formerly a print!)
all together and just include the repr of the data in the exception
itself instead of the useless string "Unknown".

This code path is unlikely to even be possible to take given the
nature of the pipe it gets subprocess data from.

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


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1371,11 +1371,10 @@
                     exception_name, hex_errno, err_msg = (
                             errpipe_data.split(b':', 2))
                 except ValueError:
-                    warnings.warn(RuntimeWarning(
-                            'Bad exception data: %r' % errpipe_data))
                     exception_name = b'RuntimeError'
                     hex_errno = b'0'
-                    err_msg = b'Unknown'
+                    err_msg = (b'Bad exception data from child: ' +
+                               repr(errpipe_data))
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
                         RuntimeError)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -162,6 +162,9 @@
 Library
 -------
 
+- Remove a bare print to stdout from the subprocess module that could have
+  happened if the child process wrote garbage to its pre-exec error pipe.
+
 - Issue #16327: The subprocess module no longer leaks file descriptors
   used for stdin/stdout/stderr pipes to the child when fork() fails.
 

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

From python-checkins at python.org  Sun Nov 11 09:08:59 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 09:08:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Remove_the_subprocess_=22bad_exception_data=22_warning_=28form?=
 =?utf-8?q?erly_a_print!=29?=
Message-ID: <3Xznmq6H8MzQ4k@mail.python.org>

http://hg.python.org/cpython/rev/2cc7e3f9cd35
changeset:   80377:2cc7e3f9cd35
branch:      3.3
parent:      80373:fd45ae32d12f
parent:      80376:bbfff05ed34f
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 00:04:52 2012 -0800
summary:
  Remove the subprocess "bad exception data" warning (formerly a print!)
all together and just include the repr of the data in the exception
itself instead of the useless string "Unknown".

This code path is unlikely to even be possible to take given the
nature of the pipe it gets subprocess data from.

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


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1412,11 +1412,10 @@
                     exception_name, hex_errno, err_msg = (
                             errpipe_data.split(b':', 2))
                 except ValueError:
-                    warnings.warn(RuntimeWarning(
-                            'Bad exception data: %r' % errpipe_data))
                     exception_name = b'RuntimeError'
                     hex_errno = b'0'
-                    err_msg = b'Unknown'
+                    err_msg = (b'Bad exception data from child: ' +
+                               repr(errpipe_data))
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
                         RuntimeError)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@
 Library
 -------
 
+- Remove a bare print to stdout from the subprocess module that could have
+  happened if the child process wrote garbage to its pre-exec error pipe.
+
 - Issue #16327: The subprocess module no longer leaks file descriptors
   used for stdin/stdout/stderr pipes to the child when fork() fails.
 

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

From python-checkins at python.org  Sun Nov 11 09:09:01 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 09:09:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Remove_the_subprocess_=22bad_exception_data=22_warning_?=
 =?utf-8?q?=28formerly_a_print!=29?=
Message-ID: <3Xznms1XSJzQ81@mail.python.org>

http://hg.python.org/cpython/rev/44e5b48998ef
changeset:   80378:44e5b48998ef
parent:      80375:9180fb4eccc7
parent:      80377:2cc7e3f9cd35
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 00:08:45 2012 -0800
summary:
  Remove the subprocess "bad exception data" warning (formerly a print!)
all together and just include the repr of the data in the exception
itself instead of the useless string "Unknown".

This code path is unlikely to even be possible to take given the
nature of the pipe it gets subprocess data from.

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


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1412,11 +1412,10 @@
                     exception_name, hex_errno, err_msg = (
                             errpipe_data.split(b':', 2))
                 except ValueError:
-                    warnings.warn(RuntimeWarning(
-                            'Bad exception data: %r' % errpipe_data))
                     exception_name = b'SubprocessError'
                     hex_errno = b'0'
-                    err_msg = b'Unknown'
+                    err_msg = (b'Bad exception data from child: ' +
+                               repr(errpipe_data))
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
                         SubprocessError)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,9 @@
 Library
 -------
 
+- Remove a bare print to stdout from the subprocess module that could have
+  happened if the child process wrote garbage to its pre-exec error pipe.
+
 - The subprocess module now raises its own SubprocessError instead of a
   RuntimeError in various error situations which should not normally happen.
 

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

From python-checkins at python.org  Sun Nov 11 10:41:59 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 10:41:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixes_issue_?=
 =?utf-8?q?=2316140=3A_The_subprocess_module_no_longer_double_closes_its?=
Message-ID: <3Xzqr76cMtzNK3@mail.python.org>

http://hg.python.org/cpython/rev/6ebfdfe74c04
changeset:   80379:6ebfdfe74c04
branch:      3.2
parent:      80376:bbfff05ed34f
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 01:37:02 2012 -0800
summary:
  Fixes issue #16140: The subprocess module no longer double closes its
child subprocess.PIPE parent file descriptors on child error prior to
exec().

This would lead to race conditions in multithreaded programs where
another thread opened a file reusing the fd which was then closed out
from beneath it by the errant second close.

files:
  Lib/subprocess.py           |   3 -
  Lib/test/test_subprocess.py |  38 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 +
  3 files changed, 41 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1378,9 +1378,6 @@
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
                         RuntimeError)
-                for fd in (p2cwrite, c2pread, errread):
-                    if fd != -1:
-                        os.close(fd)
                 err_msg = err_msg.decode(errors="surrogatepass")
                 if issubclass(child_exception_type, OSError) and hex_errno:
                     errno_num = int(hex_errno, 16)
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
@@ -1035,6 +1035,44 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+        class SafeConstructorPopen(subprocess.Popen):
+            def __init__(self):
+                pass  # Do nothing so we can modify the instance for testing.
+            def RealPopen(self, *args, **kwargs):
+                subprocess.Popen.__init__(self, *args, **kwargs)
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
+
+        p = SafeConstructorPopen()
+
+        def _test_fds_execute_child_wrapper(*args, **kwargs):
+            try:
+                subprocess.Popen._execute_child(p, *args, **kwargs)
+            finally:
+                # Open a bunch of file descriptors and verify that
+                # none of them are the same as the ones the Popen
+                # instance is using for stdin/stdout/stderr.
+                devzero_fds = [os.open("/dev/zero", os.O_RDONLY)
+                               for _ in range(8)]
+                try:
+                    for fd in devzero_fds:
+                        self.assertNotIn(fd, (
+                                p.stdin.fileno(), p.stdout.fileno(),
+                                p.stderr.fileno()),
+                                msg="At least one fd was closed early.")
+                finally:
+                    map(os.close, devzero_fds)
+
+        p._execute_child = _test_fds_execute_child_wrapper
+
+        with self.assertRaises(RuntimeError):
+            p.RealPopen([sys.executable, "-c", "pass"],
+                        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE, preexec_fn=raise_it)
+
     def test_preexec_gc_module_failure(self):
         # This tests the code that disables garbage collection if the child
         # process will execute any Python.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -162,6 +162,9 @@
 Library
 -------
 
+- Issue #16140: The subprocess module no longer double closes its child
+  subprocess.PIPE parent file descriptors on child error prior to exec().
+
 - Remove a bare print to stdout from the subprocess module that could have
   happened if the child process wrote garbage to its pre-exec error pipe.
 

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

From python-checkins at python.org  Sun Nov 11 10:42:01 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 10:42:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Fixes_issue_=2316140=3A_The_subprocess_module_no_longer_double?=
 =?utf-8?q?_closes_its?=
Message-ID: <3Xzqr93LX9zQ81@mail.python.org>

http://hg.python.org/cpython/rev/9f8b0444c8a6
changeset:   80380:9f8b0444c8a6
branch:      3.3
parent:      80377:2cc7e3f9cd35
parent:      80379:6ebfdfe74c04
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 01:38:18 2012 -0800
summary:
  Fixes issue #16140: The subprocess module no longer double closes its
child subprocess.PIPE parent file descriptors on child error prior to
exec().

This would lead to race conditions in multithreaded programs where
another thread opened a file reusing the fd which was then closed out
from beneath it by the errant second close.

files:
  Lib/subprocess.py           |   3 -
  Lib/test/test_subprocess.py |  38 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 +
  3 files changed, 41 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1419,9 +1419,6 @@
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
                         RuntimeError)
-                for fd in (p2cwrite, c2pread, errread):
-                    if fd != -1:
-                        os.close(fd)
                 err_msg = err_msg.decode(errors="surrogatepass")
                 if issubclass(child_exception_type, OSError) and hex_errno:
                     errno_num = int(hex_errno, 16)
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
@@ -1189,6 +1189,44 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+        class SafeConstructorPopen(subprocess.Popen):
+            def __init__(self):
+                pass  # Do nothing so we can modify the instance for testing.
+            def RealPopen(self, *args, **kwargs):
+                subprocess.Popen.__init__(self, *args, **kwargs)
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
+
+        p = SafeConstructorPopen()
+
+        def _test_fds_execute_child_wrapper(*args, **kwargs):
+            try:
+                subprocess.Popen._execute_child(p, *args, **kwargs)
+            finally:
+                # Open a bunch of file descriptors and verify that
+                # none of them are the same as the ones the Popen
+                # instance is using for stdin/stdout/stderr.
+                devzero_fds = [os.open("/dev/zero", os.O_RDONLY)
+                               for _ in range(8)]
+                try:
+                    for fd in devzero_fds:
+                        self.assertNotIn(fd, (
+                                p.stdin.fileno(), p.stdout.fileno(),
+                                p.stderr.fileno()),
+                                msg="At least one fd was closed early.")
+                finally:
+                    map(os.close, devzero_fds)
+
+        p._execute_child = _test_fds_execute_child_wrapper
+
+        with self.assertRaises(RuntimeError):
+            p.RealPopen([sys.executable, "-c", "pass"],
+                        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE, preexec_fn=raise_it)
+
     def test_preexec_gc_module_failure(self):
         # This tests the code that disables garbage collection if the child
         # process will execute any Python.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@
 Library
 -------
 
+- Issue #16140: The subprocess module no longer double closes its child
+  subprocess.PIPE parent file descriptors on child error prior to exec().
+
 - Remove a bare print to stdout from the subprocess module that could have
   happened if the child process wrote garbage to its pre-exec error pipe.
 

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

From python-checkins at python.org  Sun Nov 11 10:42:03 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 10:42:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fixes_issue_=2316140=3A_The_subprocess_module_no_longer_?=
 =?utf-8?q?double_closes_its?=
Message-ID: <3XzqrC09h0zQFQ@mail.python.org>

http://hg.python.org/cpython/rev/d51df72dadb7
changeset:   80381:d51df72dadb7
parent:      80378:44e5b48998ef
parent:      80380:9f8b0444c8a6
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 01:41:49 2012 -0800
summary:
  Fixes issue #16140: The subprocess module no longer double closes its
child subprocess.PIPE parent file descriptors on child error prior to
exec().

This would lead to race conditions in multithreaded programs where
another thread opened a file reusing the fd which was then closed out
from beneath it by the errant second close.

files:
  Lib/subprocess.py           |   3 -
  Lib/test/test_subprocess.py |  39 +++++++++++++++++++++++++
  Misc/NEWS                   |   3 +
  3 files changed, 42 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1419,9 +1419,6 @@
                 child_exception_type = getattr(
                         builtins, exception_name.decode('ascii'),
                         SubprocessError)
-                for fd in (p2cwrite, c2pread, errread):
-                    if fd != -1:
-                        os.close(fd)
                 err_msg = err_msg.decode(errors="surrogatepass")
                 if issubclass(child_exception_type, OSError) and hex_errno:
                     errno_num = int(hex_errno, 16)
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
@@ -1189,6 +1189,45 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+        class SafeConstructorPopen(subprocess.Popen):
+            def __init__(self):
+                pass  # Do nothing so we can modify the instance for testing.
+            def RealPopen(self, *args, **kwargs):
+                subprocess.Popen.__init__(self, *args, **kwargs)
+        def raise_it():
+            raise subprocess.SubprocessError(
+                    "force the _execute_child() errpipe_data path.")
+
+        p = SafeConstructorPopen()
+
+        def _test_fds_execute_child_wrapper(*args, **kwargs):
+            try:
+                subprocess.Popen._execute_child(p, *args, **kwargs)
+            finally:
+                # Open a bunch of file descriptors and verify that
+                # none of them are the same as the ones the Popen
+                # instance is using for stdin/stdout/stderr.
+                devzero_fds = [os.open("/dev/zero", os.O_RDONLY)
+                               for _ in range(8)]
+                try:
+                    for fd in devzero_fds:
+                        self.assertNotIn(fd, (
+                                p.stdin.fileno(), p.stdout.fileno(),
+                                p.stderr.fileno()),
+                                msg="At least one fd was closed early.")
+                finally:
+                    map(os.close, devzero_fds)
+
+        p._execute_child = _test_fds_execute_child_wrapper
+
+        with self.assertRaises(subprocess.SubprocessError):
+            p.RealPopen([sys.executable, "-c", "pass"],
+                        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE, preexec_fn=raise_it)
+
     def test_preexec_gc_module_failure(self):
         # This tests the code that disables garbage collection if the child
         # process will execute any Python.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,9 @@
 Library
 -------
 
+- Issue #16140: The subprocess module no longer double closes its child
+  subprocess.PIPE parent file descriptors on child error prior to exec().
+
 - Remove a bare print to stdout from the subprocess module that could have
   happened if the child process wrote garbage to its pre-exec error pipe.
 

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

From python-checkins at python.org  Sun Nov 11 11:02:11 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 11:02:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRml4IGlzc3VlICMx?=
 =?utf-8?q?6140_bug_that_the_fix_to_issue_=2316327_added_-_don=27t_double?=
Message-ID: <3XzrHR57LdzQ7F@mail.python.org>

http://hg.python.org/cpython/rev/2bdd984a55ac
changeset:   80382:2bdd984a55ac
branch:      2.7
parent:      80371:e67620048d2f
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 02:00:49 2012 -0800
summary:
  Fix issue #16140 bug that the fix to issue #16327 added - don't double
close subprocess.PIPE file descriptors when the child encounters an
error prior to exec.

files:
  Lib/subprocess.py           |   3 -
  Lib/test/test_subprocess.py |  47 +++++++++++++++++++++++++
  2 files changed, 47 insertions(+), 3 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1274,9 +1274,6 @@
                     if e.errno != errno.ECHILD:
                         raise
                 child_exception = pickle.loads(data)
-                for fd in (p2cwrite, c2pread, errread):
-                    if fd is not None:
-                        os.close(fd)
                 raise child_exception
 
 
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
@@ -751,6 +751,53 @@
         self.addCleanup(p.stdout.close)
         self.assertEqual(p.stdout.read(), "apple")
 
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+        class SafeConstructorPopen(subprocess.Popen):
+            def __init__(self):
+                pass  # Do nothing so we can modify the instance for testing.
+            def RealPopen(self, *args, **kwargs):
+                subprocess.Popen.__init__(self, *args, **kwargs)
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
+
+        p = SafeConstructorPopen()
+
+        def _test_fds_execute_child_wrapper(
+                args, executable, preexec_fn, close_fds, cwd, env,
+                universal_newlines, startupinfo, creationflags, shell,
+                p2cread, p2cwrite,
+                c2pread, c2pwrite,
+                errread, errwrite):
+            try:
+                subprocess.Popen._execute_child(
+                        p, args, executable, preexec_fn, close_fds,
+                        cwd, env, universal_newlines,
+                        startupinfo, creationflags, shell,
+                        p2cread, p2cwrite,
+                        c2pread, c2pwrite,
+                        errread, errwrite)
+            finally:
+                # Open a bunch of file descriptors and verify that
+                # none of them are the same as the ones the Popen
+                # instance is using for stdin/stdout/stderr.
+                devzero_fds = [os.open("/dev/zero", os.O_RDONLY)
+                               for _ in range(8)]
+                try:
+                    for fd in devzero_fds:
+                        self.assertNotIn(fd, (p2cwrite, c2pread, errread))
+                                         
+                finally:
+                    map(os.close, devzero_fds)
+
+        p._execute_child = _test_fds_execute_child_wrapper
+
+        with self.assertRaises(RuntimeError):
+            p.RealPopen([sys.executable, "-c", "pass"],
+                        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE, preexec_fn=raise_it)
+
     def test_args_string(self):
         # args is a string
         f, fname = mkstemp()

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

From python-checkins at python.org  Sun Nov 11 11:02:13 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 11:02:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_whitespace_fix?=
Message-ID: <3XzrHT0GXMzQ7c@mail.python.org>

http://hg.python.org/cpython/rev/2ca307556a7a
changeset:   80383:2ca307556a7a
branch:      2.7
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 02:01:56 2012 -0800
summary:
  whitespace fix

files:
  Lib/test/test_subprocess.py |  2 +-
  1 files changed, 1 insertions(+), 1 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
@@ -787,7 +787,7 @@
                 try:
                     for fd in devzero_fds:
                         self.assertNotIn(fd, (p2cwrite, c2pread, errread))
-                                         
+
                 finally:
                     map(os.close, devzero_fds)
 

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

From python-checkins at python.org  Sun Nov 11 14:20:36 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 14:20:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1Njc3?=
 =?utf-8?q?=3A_Document_that_zlib_and_gzip_accept_a_compression_level_of_0?=
 =?utf-8?q?_to?=
Message-ID: <3XzwhN0X2YzQQ8@mail.python.org>

http://hg.python.org/cpython/rev/735ef27fa231
changeset:   80384:735ef27fa231
branch:      2.7
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 13:52:10 2012 +0100
summary:
  Issue #15677: Document that zlib and gzip accept a compression level of 0 to mean 'no compression'.

Patch by Brian Brazil.

files:
  Doc/library/gzip.rst |   7 ++++---
  Doc/library/zlib.rst |  11 ++++++-----
  Lib/gzip.py          |   5 +++--
  Misc/ACKS            |   1 +
  Misc/NEWS            |   3 +++
  5 files changed, 17 insertions(+), 10 deletions(-)


diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -49,9 +49,10 @@
    not given, the 'b' flag will be added to the mode to ensure the file is opened
    in binary mode for cross-platform portability.
 
-   The *compresslevel* argument is an integer from ``1`` to ``9`` controlling the
-   level of compression; ``1`` is fastest and produces the least compression, and
-   ``9`` is slowest and produces the most compression.  The default is ``9``.
+   The *compresslevel* argument is an integer from ``0`` to ``9`` controlling
+   the level of compression; ``1`` is fastest and produces the least
+   compression, and ``9`` is slowest and produces the most compression. ``0``
+   is no compression. The default is ``9``.
 
    The *mtime* argument is an optional numeric timestamp to be written to
    the stream when compressing.  All :program:`gzip` compressed streams are
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -62,18 +62,19 @@
 .. function:: compress(string[, level])
 
    Compresses the data in *string*, returning a string contained compressed data.
-   *level* is an integer from ``1`` to ``9`` controlling the level of compression;
+   *level* is an integer from ``0`` to ``9`` controlling the level of compression;
    ``1`` is fastest and produces the least compression, ``9`` is slowest and
-   produces the most.  The default value is ``6``.  Raises the :exc:`error`
-   exception if any error occurs.
+   produces the most.  ``0`` is no compression.  The default value is ``6``.
+   Raises the :exc:`error` exception if any error occurs.
 
 
 .. function:: compressobj([level])
 
    Returns a compression object, to be used for compressing data streams that won't
-   fit into memory at once.  *level* is an integer from ``1`` to ``9`` controlling
+   fit into memory at once.  *level* is an integer from ``0`` to ``9`` controlling
    the level of compression; ``1`` is fastest and produces the least compression,
-   ``9`` is slowest and produces the most.  The default value is ``6``.
+   ``9`` is slowest and produces the most.  ``0`` is no compression.  The default
+   value is ``6``.
 
 
 .. function:: crc32(data[, value])
diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -66,9 +66,10 @@
         Be aware that only the 'rb', 'ab', and 'wb' values should be used
         for cross-platform portability.
 
-        The compresslevel argument is an integer from 1 to 9 controlling the
+        The compresslevel argument is an integer from 0 to 9 controlling the
         level of compression; 1 is fastest and produces the least compression,
-        and 9 is slowest and produces the most compression.  The default is 9.
+        and 9 is slowest and produces the most compression. 0 is no compression
+        at all. The default is 9.
 
         The mtime argument is an optional numeric timestamp to be written
         to the stream when compressing.  All gzip compressed streams
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -120,6 +120,7 @@
 Georg Brandl
 Christopher Brannon
 Terrence Brannon
+Brian Brazil
 Dave Brennan
 Tom Bridgman
 Keith Briggs
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -556,6 +556,9 @@
 Documentation
 -------------
 
+- Issue #15677: Document that zlib and gzip accept a compression level of 0 to
+  mean 'no compression'. Patch by Brian Brazil.
+
 - Issue #8040: added a version switcher to the documentation.  Patch by
   Yury Selivanov.
 

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

From python-checkins at python.org  Sun Nov 11 14:20:37 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 14:20:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1Njc3?=
 =?utf-8?q?=3A_Also_fix_docstrings_in_zlib_module=2E?=
Message-ID: <3XzwhP2nQ5zQgc@mail.python.org>

http://hg.python.org/cpython/rev/f6c4c178da56
changeset:   80385:f6c4c178da56
branch:      2.7
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 14:01:23 2012 +0100
summary:
  Issue #15677: Also fix docstrings in zlib module.

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


diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -101,7 +101,7 @@
 PyDoc_STRVAR(compressobj__doc__,
 "compressobj([level]) -- Return a compressor object.\n"
 "\n"
-"Optional arg level is the compression level, in 1-9.");
+"Optional arg level is the compression level, in 0-9.");
 
 PyDoc_STRVAR(decompressobj__doc__,
 "decompressobj([wbits]) -- Return a decompressor object.\n"
@@ -132,7 +132,7 @@
 PyDoc_STRVAR(compress__doc__,
 "compress(string[, level]) -- Returned compressed string.\n"
 "\n"
-"Optional arg level is the compression level, in 1-9.");
+"Optional arg level is the compression level, in 0-9.");
 
 static PyObject *
 PyZlib_compress(PyObject *self, PyObject *args)
@@ -1039,7 +1039,7 @@
 "zlib library, which is based on GNU zip.\n"
 "\n"
 "adler32(string[, start]) -- Compute an Adler-32 checksum.\n"
-"compress(string[, level]) -- Compress string, with compression level in 1-9.\n"
+"compress(string[, level]) -- Compress string, with compression level in 0-9.\n"
 "compressobj([level]) -- Return a compressor object.\n"
 "crc32(string[, start]) -- Compute a CRC-32 checksum.\n"
 "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"

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

From python-checkins at python.org  Sun Nov 11 14:20:38 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 14:20:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1Njc3?=
 =?utf-8?q?=3A_Document_that_zlib_and_gzip_accept_a_compression_level_of_0?=
 =?utf-8?q?_to?=
Message-ID: <3XzwhQ6PhSzQR7@mail.python.org>

http://hg.python.org/cpython/rev/9dde30690f44
changeset:   80386:9dde30690f44
branch:      3.2
parent:      80379:6ebfdfe74c04
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 14:04:14 2012 +0100
summary:
  Issue #15677: Document that zlib and gzip accept a compression level of 0 to mean 'no compression'.

Patch by Brian Brazil.

files:
  Doc/library/gzip.rst |   7 ++++---
  Doc/library/zlib.rst |  15 ++++++++-------
  Lib/gzip.py          |   7 ++++---
  Misc/NEWS            |   3 +++
  Modules/zlibmodule.c |   6 +++---
  5 files changed, 22 insertions(+), 16 deletions(-)


diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -50,9 +50,10 @@
    supported. If you need to read a compressed file in text mode, wrap your
    :class:`GzipFile` with an :class:`io.TextIOWrapper`.
 
-   The *compresslevel* argument is an integer from ``1`` to ``9`` controlling the
-   level of compression; ``1`` is fastest and produces the least compression, and
-   ``9`` is slowest and produces the most compression.  The default is ``9``.
+   The *compresslevel* argument is an integer from ``0`` to ``9`` controlling
+   the level of compression; ``1`` is fastest and produces the least
+   compression, and ``9`` is slowest and produces the most compression. ``0``
+   is no compression. The default is ``9``.
 
    The *mtime* argument is an optional numeric timestamp to be written to
    the stream when compressing.  All :program:`gzip` compressed streams are
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -51,19 +51,20 @@
 
 .. function:: compress(data[, level])
 
-   Compresses the bytes in *data*, returning a bytes object containing compressed data.
-   *level* is an integer from ``1`` to ``9`` controlling the level of compression;
-   ``1`` is fastest and produces the least compression, ``9`` is slowest and
-   produces the most.  The default value is ``6``.  Raises the :exc:`error`
-   exception if any error occurs.
+   Compresses the bytes in *data*, returning a bytes object containing
+   compressed data.  *level* is an integer from ``0`` to ``9`` controlling the
+   level of compression; ``1`` is fastest and produces the least compression,
+   ``9`` is slowest and produces the most. ``0`` is no compression. The default
+   value is ``6``.  Raises the :exc:`error` exception if any error occurs.
 
 
 .. function:: compressobj([level])
 
    Returns a compression object, to be used for compressing data streams that won't
-   fit into memory at once.  *level* is an integer from ``1`` to ``9`` controlling
+   fit into memory at once.  *level* is an integer from ``0`` to ``9`` controlling
    the level of compression; ``1`` is fastest and produces the least compression,
-   ``9`` is slowest and produces the most.  The default value is ``6``.
+   ``9`` is slowest and produces the most.  ``0`` is no compression.  The default
+   value is ``6``.
 
 
 .. function:: crc32(data[, value])
diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -137,9 +137,10 @@
         A mode of 'r' is equivalent to one of 'rb', and similarly for 'w' and
         'wb', and 'a' and 'ab'.
 
-        The compresslevel argument is an integer from 1 to 9 controlling the
+        The compresslevel argument is an integer from 0 to 9 controlling the
         level of compression; 1 is fastest and produces the least compression,
-        and 9 is slowest and produces the most compression.  The default is 9.
+        and 9 is slowest and produces the most compression. 0 is no compression
+        at all. The default is 9.
 
         The mtime argument is an optional numeric timestamp to be written
         to the stream when compressing.  All gzip compressed streams
@@ -573,7 +574,7 @@
 
 def compress(data, compresslevel=9):
     """Compress data in one shot and return the compressed string.
-    Optional argument is the compression level, in range of 1-9.
+    Optional argument is the compression level, in range of 0-9.
     """
     buf = io.BytesIO()
     with GzipFile(fileobj=buf, mode='wb', compresslevel=compresslevel) as f:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -714,6 +714,9 @@
 Documentation
 -------------
 
+- Issue #15677: Document that zlib and gzip accept a compression level of 0 to
+  mean 'no compression'. Patch by Brian Brazil.
+
 - Issue #8040: added a version switcher to the documentation.  Patch by
   Yury Selivanov.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -81,7 +81,7 @@
 PyDoc_STRVAR(compressobj__doc__,
 "compressobj([level]) -- Return a compressor object.\n"
 "\n"
-"Optional arg level is the compression level, in 1-9.");
+"Optional arg level is the compression level, in 0-9.");
 
 PyDoc_STRVAR(decompressobj__doc__,
 "decompressobj([wbits]) -- Return a decompressor object.\n"
@@ -115,7 +115,7 @@
 PyDoc_STRVAR(compress__doc__,
 "compress(string[, level]) -- Returned compressed string.\n"
 "\n"
-"Optional arg level is the compression level, in 1-9.");
+"Optional arg level is the compression level, in 0-9.");
 
 static PyObject *
 PyZlib_compress(PyObject *self, PyObject *args)
@@ -1135,7 +1135,7 @@
 "zlib library, which is based on GNU zip.\n"
 "\n"
 "adler32(string[, start]) -- Compute an Adler-32 checksum.\n"
-"compress(string[, level]) -- Compress string, with compression level in 1-9.\n"
+"compress(string[, level]) -- Compress string, with compression level in 0-9.\n"
 "compressobj([level]) -- Return a compressor object.\n"
 "crc32(string[, start]) -- Compute a CRC-32 checksum.\n"
 "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"

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

From python-checkins at python.org  Sun Nov 11 14:20:40 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 14:20:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2315677=3A_Document_that_zlib_and_gzip_accept_a_compres?=
 =?utf-8?q?sion_level_of_0_to?=
Message-ID: <3XzwhS30HXzQGN@mail.python.org>

http://hg.python.org/cpython/rev/0e48bf45313c
changeset:   80387:0e48bf45313c
branch:      3.3
parent:      80380:9f8b0444c8a6
parent:      80386:9dde30690f44
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 14:14:47 2012 +0100
summary:
  Issue #15677: Document that zlib and gzip accept a compression level of 0 to mean 'no compression'.

Patch by Brian Brazil.

files:
  Doc/library/gzip.rst |   9 +++++----
  Doc/library/zlib.rst |  11 ++++++-----
  Lib/gzip.py          |   7 ++++---
  Misc/NEWS            |   3 +++
  Modules/zlibmodule.c |   4 ++--
  5 files changed, 20 insertions(+), 14 deletions(-)


diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -38,7 +38,7 @@
    ``'w'``, or ``'wb'`` for binary mode, or ``'rt'``, ``'at'``, or ``'wt'`` for
    text mode. The default is ``'rb'``.
 
-   The *compresslevel* argument is an integer from 1 to 9, as for the
+   The *compresslevel* argument is an integer from 0 to 9, as for the
    :class:`GzipFile` constructor.
 
    For binary mode, this function is equivalent to the :class:`GzipFile`
@@ -80,9 +80,10 @@
    in text mode, use :func:`.open` (or wrap your :class:`GzipFile` with an
    :class:`io.TextIOWrapper`).
 
-   The *compresslevel* argument is an integer from ``1`` to ``9`` controlling the
-   level of compression; ``1`` is fastest and produces the least compression, and
-   ``9`` is slowest and produces the most compression.  The default is ``9``.
+   The *compresslevel* argument is an integer from ``0`` to ``9`` controlling
+   the level of compression; ``1`` is fastest and produces the least
+   compression, and ``9`` is slowest and produces the most compression. ``0``
+   is no compression. The default is ``9``.
 
    The *mtime* argument is an optional numeric timestamp to be written to
    the stream when compressing.  All :program:`gzip` compressed streams are
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -52,10 +52,10 @@
 .. function:: compress(data[, level])
 
    Compresses the bytes in *data*, returning a bytes object containing compressed data.
-   *level* is an integer from ``1`` to ``9`` controlling the level of compression;
+   *level* is an integer from ``0`` to ``9`` controlling the level of compression;
    ``1`` is fastest and produces the least compression, ``9`` is slowest and
-   produces the most.  The default value is ``6``.  Raises the :exc:`error`
-   exception if any error occurs.
+   produces the most.  ``0`` is no compression.  The default value is ``6``.
+   Raises the :exc:`error` exception if any error occurs.
 
 
 .. function:: compressobj(level=-1, method=DEFLATED, wbits=15, memlevel=8, strategy=Z_DEFAULT_STRATEGY[, zdict])
@@ -63,9 +63,10 @@
    Returns a compression object, to be used for compressing data streams that won't
    fit into memory at once.
 
-   *level* is the compression level -- an integer from ``1`` to ``9``. A value
+   *level* is the compression level -- an integer from ``0`` to ``9``. A value
    of ``1`` is fastest and produces the least compression, while a value of
-   ``9`` is slowest and produces the most. The default value is ``6``.
+   ``9`` is slowest and produces the most. ``0`` is no compression. The default
+   value is ``6``.
 
    *method* is the compression algorithm. Currently, the only supported value is
    ``DEFLATED``.
diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -160,9 +160,10 @@
         A mode of 'r' is equivalent to one of 'rb', and similarly for 'w' and
         'wb', and 'a' and 'ab'.
 
-        The compresslevel argument is an integer from 1 to 9 controlling the
+        The compresslevel argument is an integer from 0 to 9 controlling the
         level of compression; 1 is fastest and produces the least compression,
-        and 9 is slowest and produces the most compression.  The default is 9.
+        and 9 is slowest and produces the most compression. 0 is no compression
+        at all. The default is 9.
 
         The mtime argument is an optional numeric timestamp to be written
         to the stream when compressing.  All gzip compressed streams
@@ -622,7 +623,7 @@
 
 def compress(data, compresslevel=9):
     """Compress data in one shot and return the compressed string.
-    Optional argument is the compression level, in range of 1-9.
+    Optional argument is the compression level, in range of 0-9.
     """
     buf = io.BytesIO()
     with GzipFile(fileobj=buf, mode='wb', compresslevel=compresslevel) as f:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -264,6 +264,9 @@
 Documentation
 -------------
 
+- Issue #15677: Document that zlib and gzip accept a compression level of 0 to
+  mean 'no compression'. Patch by Brian Brazil.
+
 - Issue #8040: added a version switcher to the documentation.  Patch by
   Yury Selivanov.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -139,7 +139,7 @@
 PyDoc_STRVAR(compress__doc__,
 "compress(string[, level]) -- Returned compressed string.\n"
 "\n"
-"Optional arg level is the compression level, in 1-9.");
+"Optional arg level is the compression level, in 0-9.");
 
 static PyObject *
 PyZlib_compress(PyObject *self, PyObject *args)
@@ -1227,7 +1227,7 @@
 "zlib library, which is based on GNU zip.\n"
 "\n"
 "adler32(string[, start]) -- Compute an Adler-32 checksum.\n"
-"compress(string[, level]) -- Compress string, with compression level in 1-9.\n"
+"compress(string[, level]) -- Compress string, with compression level in 0-9.\n"
 "compressobj([level[, ...]]) -- Return a compressor object.\n"
 "crc32(string[, start]) -- Compute a CRC-32 checksum.\n"
 "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"

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

From python-checkins at python.org  Sun Nov 11 14:20:41 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 11 Nov 2012 14:20:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315677=3A_Document_that_zlib_and_gzip_accept_a_c?=
 =?utf-8?q?ompression_level_of_0_to?=
Message-ID: <3XzwhT6l4RzQG1@mail.python.org>

http://hg.python.org/cpython/rev/21335c9fcec0
changeset:   80388:21335c9fcec0
parent:      80381:d51df72dadb7
parent:      80387:0e48bf45313c
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Nov 11 14:20:09 2012 +0100
summary:
  Issue #15677: Document that zlib and gzip accept a compression level of 0 to mean 'no compression'.

Patch by Brian Brazil.

files:
  Doc/library/gzip.rst |   9 +++++----
  Doc/library/zlib.rst |  11 ++++++-----
  Lib/gzip.py          |   7 ++++---
  Misc/NEWS            |   3 +++
  Modules/zlibmodule.c |   4 ++--
  5 files changed, 20 insertions(+), 14 deletions(-)


diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -38,7 +38,7 @@
    ``'w'``, or ``'wb'`` for binary mode, or ``'rt'``, ``'at'``, or ``'wt'`` for
    text mode. The default is ``'rb'``.
 
-   The *compresslevel* argument is an integer from 1 to 9, as for the
+   The *compresslevel* argument is an integer from 0 to 9, as for the
    :class:`GzipFile` constructor.
 
    For binary mode, this function is equivalent to the :class:`GzipFile`
@@ -80,9 +80,10 @@
    in text mode, use :func:`.open` (or wrap your :class:`GzipFile` with an
    :class:`io.TextIOWrapper`).
 
-   The *compresslevel* argument is an integer from ``1`` to ``9`` controlling the
-   level of compression; ``1`` is fastest and produces the least compression, and
-   ``9`` is slowest and produces the most compression.  The default is ``9``.
+   The *compresslevel* argument is an integer from ``0`` to ``9`` controlling
+   the level of compression; ``1`` is fastest and produces the least
+   compression, and ``9`` is slowest and produces the most compression. ``0``
+   is no compression. The default is ``9``.
 
    The *mtime* argument is an optional numeric timestamp to be written to
    the stream when compressing.  All :program:`gzip` compressed streams are
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -52,10 +52,10 @@
 .. function:: compress(data[, level])
 
    Compresses the bytes in *data*, returning a bytes object containing compressed data.
-   *level* is an integer from ``1`` to ``9`` controlling the level of compression;
+   *level* is an integer from ``0`` to ``9`` controlling the level of compression;
    ``1`` is fastest and produces the least compression, ``9`` is slowest and
-   produces the most.  The default value is ``6``.  Raises the :exc:`error`
-   exception if any error occurs.
+   produces the most.  ``0`` is no compression.  The default value is ``6``.
+   Raises the :exc:`error` exception if any error occurs.
 
 
 .. function:: compressobj(level=-1, method=DEFLATED, wbits=15, memlevel=8, strategy=Z_DEFAULT_STRATEGY[, zdict])
@@ -63,9 +63,10 @@
    Returns a compression object, to be used for compressing data streams that won't
    fit into memory at once.
 
-   *level* is the compression level -- an integer from ``1`` to ``9``. A value
+   *level* is the compression level -- an integer from ``0`` to ``9``. A value
    of ``1`` is fastest and produces the least compression, while a value of
-   ``9`` is slowest and produces the most. The default value is ``6``.
+   ``9`` is slowest and produces the most. ``0`` is no compression. The default
+   value is ``6``.
 
    *method* is the compression algorithm. Currently, the only supported value is
    ``DEFLATED``.
diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -160,9 +160,10 @@
         A mode of 'r' is equivalent to one of 'rb', and similarly for 'w' and
         'wb', and 'a' and 'ab'.
 
-        The compresslevel argument is an integer from 1 to 9 controlling the
+        The compresslevel argument is an integer from 0 to 9 controlling the
         level of compression; 1 is fastest and produces the least compression,
-        and 9 is slowest and produces the most compression.  The default is 9.
+        and 9 is slowest and produces the most compression. 0 is no compression
+        at all. The default is 9.
 
         The mtime argument is an optional numeric timestamp to be written
         to the stream when compressing.  All gzip compressed streams
@@ -622,7 +623,7 @@
 
 def compress(data, compresslevel=9):
     """Compress data in one shot and return the compressed string.
-    Optional argument is the compression level, in range of 1-9.
+    Optional argument is the compression level, in range of 0-9.
     """
     buf = io.BytesIO()
     with GzipFile(fileobj=buf, mode='wb', compresslevel=compresslevel) as f:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -359,6 +359,9 @@
 Documentation
 -------------
 
+- Issue #15677: Document that zlib and gzip accept a compression level of 0 to
+  mean 'no compression'. Patch by Brian Brazil.
+
 - Issue #8040: added a version switcher to the documentation.  Patch by
   Yury Selivanov.
 
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -139,7 +139,7 @@
 PyDoc_STRVAR(compress__doc__,
 "compress(string[, level]) -- Returned compressed string.\n"
 "\n"
-"Optional arg level is the compression level, in 1-9.");
+"Optional arg level is the compression level, in 0-9.");
 
 static PyObject *
 PyZlib_compress(PyObject *self, PyObject *args)
@@ -1227,7 +1227,7 @@
 "zlib library, which is based on GNU zip.\n"
 "\n"
 "adler32(string[, start]) -- Compute an Adler-32 checksum.\n"
-"compress(string[, level]) -- Compress string, with compression level in 1-9.\n"
+"compress(string[, level]) -- Compress string, with compression level in 0-9.\n"
 "compressobj([level[, ...]]) -- Return a compressor object.\n"
 "crc32(string[, start]) -- Compute a CRC-32 checksum.\n"
 "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"

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

From python-checkins at python.org  Sun Nov 11 16:43:00 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 11 Nov 2012 16:43:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Fixes_=2314215=3A_copy_magic_?=
 =?utf-8?q?yaml_file_to_get_a_nice_=3Ctitle=3E_for?=
Message-ID: <3Xzzrh1Zs0zQNm@mail.python.org>

http://hg.python.org/peps/rev/11779150cf87
changeset:   4585:11779150cf87
user:        Georg Brandl <georg at python.org>
date:        Sun Nov 11 16:42:32 2012 +0100
summary:
  Fixes #14215: copy magic yaml file to get a nice <title> for python.org/dev/peps/ index page

files:
  pep2pyramid.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/pep2pyramid.py b/pep2pyramid.py
--- a/pep2pyramid.py
+++ b/pep2pyramid.py
@@ -397,6 +397,9 @@
     # for PEP 0, copy body to parent directory as well
     if pepnum == '0000':
         shutil.copyfile(outpath, os.path.join(destDir, '..', 'body.html'))
+        # apparently we need the index.yml as well to generate <title> right
+        shutil.copyfile(os.path.join(destDir, 'index.yml'),
+                        os.path.join(destDir, '..', 'index.yml'))
     copy_aux_files(inpath, destDir)
     return outpath
 

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

From python-checkins at python.org  Sun Nov 11 18:49:16 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 18:49:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Refactor_test?=
 =?utf-8?q?=5Fpreexec=5Ferrpipe_to_not_create_an_uncollectable_reference_c?=
 =?utf-8?q?ycle=2E?=
Message-ID: <3Y02fN10NnzQ81@mail.python.org>

http://hg.python.org/cpython/rev/f02123b1b446
changeset:   80389:f02123b1b446
branch:      2.7
parent:      80385:f6c4c178da56
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 09:49:02 2012 -0800
summary:
  Refactor test_preexec_errpipe to not create an uncollectable reference cycle.

files:
  Lib/test/test_subprocess.py |  42 ++++++++++++------------
  1 files changed, 21 insertions(+), 21 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
@@ -751,28 +751,22 @@
         self.addCleanup(p.stdout.close)
         self.assertEqual(p.stdout.read(), "apple")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise RuntimeError("force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            # Do nothing so we can modify the instance for testing.
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(
-                args, executable, preexec_fn, close_fds, cwd, env,
+        def _execute_child(
+                self, args, executable, preexec_fn, close_fds, cwd, env,
                 universal_newlines, startupinfo, creationflags, shell,
                 p2cread, p2cwrite,
                 c2pread, c2pwrite,
                 errread, errwrite):
             try:
                 subprocess.Popen._execute_child(
-                        p, args, executable, preexec_fn, close_fds,
+                        self, args, executable, preexec_fn, close_fds,
                         cwd, env, universal_newlines,
                         startupinfo, creationflags, shell,
                         p2cread, p2cwrite,
@@ -786,17 +780,23 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (p2cwrite, c2pread, errread))
-
+                        self._testcase.assertNotIn(
+                                fd, (p2cwrite, c2pread, errread))
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(RuntimeError):
-            p.RealPopen([sys.executable, "-c", "pass"],
-                        stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                        stderr=subprocess.PIPE, preexec_fn=raise_it)
+            self._TestExecuteChildPopen(
+                    self, [sys.executable, "-c", "pass"],
+                    stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE, preexec_fn=raise_it)
 
     def test_args_string(self):
         # args is a string

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

From python-checkins at python.org  Sun Nov 11 19:13:17 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 19:13:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Refactor_test?=
 =?utf-8?q?=5Fpreexec=5Ferrpipe_to_not_create_an_uncollectable_reference_c?=
 =?utf-8?q?ycle=2E?=
Message-ID: <3Y03B55RBVzQK5@mail.python.org>

http://hg.python.org/cpython/rev/d09b6cb719b5
changeset:   80390:d09b6cb719b5
branch:      3.2
parent:      80386:9dde30690f44
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 09:59:27 2012 -0800
summary:
  Refactor test_preexec_errpipe to not create an uncollectable reference cycle.

files:
  Lib/test/test_subprocess.py |  37 ++++++++++++------------
  1 files changed, 18 insertions(+), 19 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
@@ -1035,22 +1035,15 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise RuntimeError("force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(*args, **kwargs):
+        def _execute_child(self, *args, **kwargs):
             try:
-                subprocess.Popen._execute_child(p, *args, **kwargs)
+                subprocess.Popen._execute_child(self, *args, **kwargs)
             finally:
                 # Open a bunch of file descriptors and verify that
                 # none of them are the same as the ones the Popen
@@ -1059,17 +1052,23 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (
-                                p.stdin.fileno(), p.stdout.fileno(),
-                                p.stderr.fileno()),
+                        self._testcase.assertNotIn(
+                                fd, (self.stdin.fileno(), self.stdout.fileno(),
+                                     self.stderr.fileno()),
                                 msg="At least one fd was closed early.")
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(RuntimeError):
-            p.RealPopen([sys.executable, "-c", "pass"],
+            self._TestExecuteChildPopen(
+                        self, [sys.executable, "-c", "pass"],
                         stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE, preexec_fn=raise_it)
 

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

From python-checkins at python.org  Sun Nov 11 19:13:19 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 19:13:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Refactor_test=5Fpreexec=5Ferrpipe_to_not_create_an_uncollectab?=
 =?utf-8?q?le_reference_cycle=2E?=
Message-ID: <3Y03B70jn7zQK5@mail.python.org>

http://hg.python.org/cpython/rev/1fddd68b3658
changeset:   80391:1fddd68b3658
branch:      3.3
parent:      80387:0e48bf45313c
parent:      80390:d09b6cb719b5
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 10:00:49 2012 -0800
summary:
  Refactor test_preexec_errpipe to not create an uncollectable reference cycle.

files:
  Lib/test/test_subprocess.py |  37 ++++++++++++------------
  1 files changed, 18 insertions(+), 19 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
@@ -1189,22 +1189,15 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise RuntimeError("force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(*args, **kwargs):
+        def _execute_child(self, *args, **kwargs):
             try:
-                subprocess.Popen._execute_child(p, *args, **kwargs)
+                subprocess.Popen._execute_child(self, *args, **kwargs)
             finally:
                 # Open a bunch of file descriptors and verify that
                 # none of them are the same as the ones the Popen
@@ -1213,17 +1206,23 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (
-                                p.stdin.fileno(), p.stdout.fileno(),
-                                p.stderr.fileno()),
+                        self._testcase.assertNotIn(
+                                fd, (self.stdin.fileno(), self.stdout.fileno(),
+                                     self.stderr.fileno()),
                                 msg="At least one fd was closed early.")
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(RuntimeError):
-            p.RealPopen([sys.executable, "-c", "pass"],
+            self._TestExecuteChildPopen(
+                        self, [sys.executable, "-c", "pass"],
                         stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE, preexec_fn=raise_it)
 

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

From python-checkins at python.org  Sun Nov 11 19:13:20 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 19:13:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Refactor_test=5Fpreexec=5Ferrpipe_to_not_create_an_uncol?=
 =?utf-8?q?lectable_reference_cycle=2E?=
Message-ID: <3Y03B8382tzRFq@mail.python.org>

http://hg.python.org/cpython/rev/c971687e5c66
changeset:   80392:c971687e5c66
parent:      80388:21335c9fcec0
parent:      80391:1fddd68b3658
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 10:12:40 2012 -0800
summary:
  Refactor test_preexec_errpipe to not create an uncollectable reference cycle.

files:
  Lib/test/test_subprocess.py |  39 ++++++++++++------------
  1 files changed, 19 insertions(+), 20 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
@@ -1189,23 +1189,15 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise subprocess.SubprocessError(
-                    "force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(*args, **kwargs):
+        def _execute_child(self, *args, **kwargs):
             try:
-                subprocess.Popen._execute_child(p, *args, **kwargs)
+                subprocess.Popen._execute_child(self, *args, **kwargs)
             finally:
                 # Open a bunch of file descriptors and verify that
                 # none of them are the same as the ones the Popen
@@ -1214,17 +1206,24 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (
-                                p.stdin.fileno(), p.stdout.fileno(),
-                                p.stderr.fileno()),
+                        self._testcase.assertNotIn(
+                                fd, (self.stdin.fileno(), self.stdout.fileno(),
+                                     self.stderr.fileno()),
                                 msg="At least one fd was closed early.")
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise subprocess.SubprocessError(
+                    "force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(subprocess.SubprocessError):
-            p.RealPopen([sys.executable, "-c", "pass"],
+            self._TestExecuteChildPopen(
+                        self, [sys.executable, "-c", "pass"],
                         stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE, preexec_fn=raise_it)
 

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

From python-checkins at python.org  Sun Nov 11 19:13:21 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 11 Nov 2012 19:13:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_remove_an_obso?=
	=?utf-8?q?lete_comment?=
Message-ID: <3Y03B95j3FzRGS@mail.python.org>

http://hg.python.org/cpython/rev/677cf4a55a9c
changeset:   80393:677cf4a55a9c
branch:      2.7
parent:      80389:f02123b1b446
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Nov 11 10:13:06 2012 -0800
summary:
  remove an obsolete comment

files:
  Lib/test/test_subprocess.py |  1 -
  1 files changed, 0 insertions(+), 1 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
@@ -754,7 +754,6 @@
     class _TestExecuteChildPopen(subprocess.Popen):
         """Used to test behavior at the end of _execute_child."""
         def __init__(self, testcase, *args, **kwargs):
-            # Do nothing so we can modify the instance for testing.
             self._testcase = testcase
             subprocess.Popen.__init__(self, *args, **kwargs)
 

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

From python-checkins at python.org  Sun Nov 11 19:42:02 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:42:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDUz?=
 =?utf-8?q?=3A_Fix_equality_testing_of_dead_weakref_objects=2E?=
Message-ID: <3Y03qG0RVVzRDb@mail.python.org>

http://hg.python.org/cpython/rev/590f1b55abea
changeset:   80394:590f1b55abea
branch:      3.2
parent:      80386:9dde30690f44
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:36:51 2012 +0100
summary:
  Issue #16453: Fix equality testing of dead weakref objects.
Also add tests for ordering and hashing.

files:
  Lib/test/test_weakref.py |  105 +++++++++++++++++++++-----
  Misc/NEWS                |    2 +
  Objects/weakrefobject.c  |   10 +-
  3 files changed, 93 insertions(+), 24 deletions(-)


diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -32,6 +32,27 @@
     return C().method
 
 
+class Object:
+    def __init__(self, arg):
+        self.arg = arg
+    def __repr__(self):
+        return "<Object %r>" % self.arg
+    def __eq__(self, other):
+        if isinstance(other, Object):
+            return self.arg == other.arg
+        return NotImplemented
+    def __lt__(self, other):
+        if isinstance(other, Object):
+            return self.arg < other.arg
+        return NotImplemented
+    def __hash__(self):
+        return hash(self.arg)
+
+class RefCycle:
+    def __init__(self):
+        self.cycle = self
+
+
 class TestBase(unittest.TestCase):
 
     def setUp(self):
@@ -692,6 +713,69 @@
         self.assertEqual(a(), None)
         self.assertEqual(l, [a])
 
+    def test_equality(self):
+        # Alive weakrefs defer equality testing to their underlying object.
+        x = Object(1)
+        y = Object(1)
+        z = Object(2)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        c = weakref.ref(z)
+        d = weakref.ref(x)
+        # Note how we directly test the operators here, to stress both
+        # __eq__ and __ne__.
+        self.assertTrue(a == b)
+        self.assertFalse(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertTrue(a == d)
+        self.assertFalse(a != d)
+        del x, y, z
+        gc.collect()
+        for r in a, b, c:
+            # Sanity check
+            self.assertIs(r(), None)
+        # Dead weakrefs compare by identity: whether `a` and `d` are the
+        # same weakref object is an implementation detail, since they pointed
+        # to the same original object and didn't have a callback.
+        # (see issue #16453).
+        self.assertFalse(a == b)
+        self.assertTrue(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertEqual(a == d, a is d)
+        self.assertEqual(a != d, a is not d)
+
+    def test_ordering(self):
+        # weakrefs cannot be ordered, even if the underlying objects can.
+        ops = [operator.lt, operator.gt, operator.le, operator.ge]
+        x = Object(1)
+        y = Object(1)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        for op in ops:
+            self.assertRaises(TypeError, op, a, b)
+        # Same when dead.
+        del x, y
+        gc.collect()
+        for op in ops:
+            self.assertRaises(TypeError, op, a, b)
+
+    def test_hashing(self):
+        # Alive weakrefs hash the same as the underlying object
+        x = Object(42)
+        y = Object(42)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        self.assertEqual(hash(a), hash(42))
+        del x, y
+        gc.collect()
+        # Dead weakrefs:
+        # - retain their hash is they were hashed when alive;
+        # - otherwise, cannot be hashed.
+        self.assertEqual(hash(a), hash(42))
+        self.assertRaises(TypeError, hash, b)
+
 
 class SubclassableWeakrefTestCase(TestBase):
 
@@ -796,27 +880,6 @@
         self.assertEqual(self.cbcalled, 0)
 
 
-class Object:
-    def __init__(self, arg):
-        self.arg = arg
-    def __repr__(self):
-        return "<Object %r>" % self.arg
-    def __eq__(self, other):
-        if isinstance(other, Object):
-            return self.arg == other.arg
-        return NotImplemented
-    def __lt__(self, other):
-        if isinstance(other, Object):
-            return self.arg < other.arg
-        return NotImplemented
-    def __hash__(self):
-        return hash(self.arg)
-
-class RefCycle:
-    def __init__(self):
-        self.cycle = self
-
-
 class MappingTestCase(TestBase):
 
     COUNT = 10
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16453: Fix equality testing of dead weakref objects.
+
 - Issue #9535: Fix pending signals that have been received but not yet
   handled by Python to not persist after os.fork() in the child process.
 
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -195,9 +195,13 @@
     }
     if (PyWeakref_GET_OBJECT(self) == Py_None
         || PyWeakref_GET_OBJECT(other) == Py_None) {
-        PyObject *res = self==other ? Py_True : Py_False;
-        Py_INCREF(res);
-        return res;
+        int res = (self == other);
+        if (op == Py_NE)
+            res = !res;
+        if (res)
+            Py_RETURN_TRUE;
+        else
+            Py_RETURN_FALSE;
     }
     return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
                                 PyWeakref_GET_OBJECT(other), op);

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

From python-checkins at python.org  Sun Nov 11 19:42:03 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:42:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316453=3A_Fix_equality_testing_of_dead_weakref_objects?=
 =?utf-8?q?=2E?=
Message-ID: <3Y03qH4KBszRGp@mail.python.org>

http://hg.python.org/cpython/rev/c00e2c1cb3a7
changeset:   80395:c00e2c1cb3a7
branch:      3.3
parent:      80387:0e48bf45313c
parent:      80394:590f1b55abea
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:37:41 2012 +0100
summary:
  Issue #16453: Fix equality testing of dead weakref objects.
Also add tests for ordering and hashing.

files:
  Lib/test/test_weakref.py |  105 +++++++++++++++++++++-----
  Misc/NEWS                |    2 +
  Objects/weakrefobject.c  |   10 +-
  3 files changed, 93 insertions(+), 24 deletions(-)


diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -32,6 +32,27 @@
     return C().method
 
 
+class Object:
+    def __init__(self, arg):
+        self.arg = arg
+    def __repr__(self):
+        return "<Object %r>" % self.arg
+    def __eq__(self, other):
+        if isinstance(other, Object):
+            return self.arg == other.arg
+        return NotImplemented
+    def __lt__(self, other):
+        if isinstance(other, Object):
+            return self.arg < other.arg
+        return NotImplemented
+    def __hash__(self):
+        return hash(self.arg)
+
+class RefCycle:
+    def __init__(self):
+        self.cycle = self
+
+
 class TestBase(unittest.TestCase):
 
     def setUp(self):
@@ -692,6 +713,69 @@
         self.assertEqual(a(), None)
         self.assertEqual(l, [a])
 
+    def test_equality(self):
+        # Alive weakrefs defer equality testing to their underlying object.
+        x = Object(1)
+        y = Object(1)
+        z = Object(2)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        c = weakref.ref(z)
+        d = weakref.ref(x)
+        # Note how we directly test the operators here, to stress both
+        # __eq__ and __ne__.
+        self.assertTrue(a == b)
+        self.assertFalse(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertTrue(a == d)
+        self.assertFalse(a != d)
+        del x, y, z
+        gc.collect()
+        for r in a, b, c:
+            # Sanity check
+            self.assertIs(r(), None)
+        # Dead weakrefs compare by identity: whether `a` and `d` are the
+        # same weakref object is an implementation detail, since they pointed
+        # to the same original object and didn't have a callback.
+        # (see issue #16453).
+        self.assertFalse(a == b)
+        self.assertTrue(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertEqual(a == d, a is d)
+        self.assertEqual(a != d, a is not d)
+
+    def test_ordering(self):
+        # weakrefs cannot be ordered, even if the underlying objects can.
+        ops = [operator.lt, operator.gt, operator.le, operator.ge]
+        x = Object(1)
+        y = Object(1)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        for op in ops:
+            self.assertRaises(TypeError, op, a, b)
+        # Same when dead.
+        del x, y
+        gc.collect()
+        for op in ops:
+            self.assertRaises(TypeError, op, a, b)
+
+    def test_hashing(self):
+        # Alive weakrefs hash the same as the underlying object
+        x = Object(42)
+        y = Object(42)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        self.assertEqual(hash(a), hash(42))
+        del x, y
+        gc.collect()
+        # Dead weakrefs:
+        # - retain their hash is they were hashed when alive;
+        # - otherwise, cannot be hashed.
+        self.assertEqual(hash(a), hash(42))
+        self.assertRaises(TypeError, hash, b)
+
 
 class SubclassableWeakrefTestCase(TestBase):
 
@@ -796,27 +880,6 @@
         self.assertEqual(self.cbcalled, 0)
 
 
-class Object:
-    def __init__(self, arg):
-        self.arg = arg
-    def __repr__(self):
-        return "<Object %r>" % self.arg
-    def __eq__(self, other):
-        if isinstance(other, Object):
-            return self.arg == other.arg
-        return NotImplemented
-    def __lt__(self, other):
-        if isinstance(other, Object):
-            return self.arg < other.arg
-        return NotImplemented
-    def __hash__(self):
-        return hash(self.arg)
-
-class RefCycle:
-    def __init__(self):
-        self.cycle = self
-
-
 class MappingTestCase(TestBase):
 
     COUNT = 10
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16453: Fix equality testing of dead weakref objects.
+
 - Issue #9535: Fix pending signals that have been received but not yet
   handled by Python to not persist after os.fork() in the child process.
 
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -198,9 +198,13 @@
     }
     if (PyWeakref_GET_OBJECT(self) == Py_None
         || PyWeakref_GET_OBJECT(other) == Py_None) {
-        PyObject *res = self==other ? Py_True : Py_False;
-        Py_INCREF(res);
-        return res;
+        int res = (self == other);
+        if (op == Py_NE)
+            res = !res;
+        if (res)
+            Py_RETURN_TRUE;
+        else
+            Py_RETURN_FALSE;
     }
     return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
                                 PyWeakref_GET_OBJECT(other), op);

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

From python-checkins at python.org  Sun Nov 11 19:42:05 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:42:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316453=3A_Fix_equality_testing_of_dead_weakref_o?=
 =?utf-8?q?bjects=2E?=
Message-ID: <3Y03qK0mLHzRDb@mail.python.org>

http://hg.python.org/cpython/rev/9e80ea48ff39
changeset:   80396:9e80ea48ff39
parent:      80388:21335c9fcec0
parent:      80394:590f1b55abea
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:39:35 2012 +0100
summary:
  Issue #16453: Fix equality testing of dead weakref objects.
Also add tests for ordering and hashing.

files:
  Lib/test/test_weakref.py |  105 +++++++++++++++++++++-----
  Misc/NEWS                |    2 +
  Objects/weakrefobject.c  |   10 +-
  3 files changed, 93 insertions(+), 24 deletions(-)


diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -32,6 +32,27 @@
     return C().method
 
 
+class Object:
+    def __init__(self, arg):
+        self.arg = arg
+    def __repr__(self):
+        return "<Object %r>" % self.arg
+    def __eq__(self, other):
+        if isinstance(other, Object):
+            return self.arg == other.arg
+        return NotImplemented
+    def __lt__(self, other):
+        if isinstance(other, Object):
+            return self.arg < other.arg
+        return NotImplemented
+    def __hash__(self):
+        return hash(self.arg)
+
+class RefCycle:
+    def __init__(self):
+        self.cycle = self
+
+
 class TestBase(unittest.TestCase):
 
     def setUp(self):
@@ -692,6 +713,69 @@
         self.assertEqual(a(), None)
         self.assertEqual(l, [a])
 
+    def test_equality(self):
+        # Alive weakrefs defer equality testing to their underlying object.
+        x = Object(1)
+        y = Object(1)
+        z = Object(2)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        c = weakref.ref(z)
+        d = weakref.ref(x)
+        # Note how we directly test the operators here, to stress both
+        # __eq__ and __ne__.
+        self.assertTrue(a == b)
+        self.assertFalse(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertTrue(a == d)
+        self.assertFalse(a != d)
+        del x, y, z
+        gc.collect()
+        for r in a, b, c:
+            # Sanity check
+            self.assertIs(r(), None)
+        # Dead weakrefs compare by identity: whether `a` and `d` are the
+        # same weakref object is an implementation detail, since they pointed
+        # to the same original object and didn't have a callback.
+        # (see issue #16453).
+        self.assertFalse(a == b)
+        self.assertTrue(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertEqual(a == d, a is d)
+        self.assertEqual(a != d, a is not d)
+
+    def test_ordering(self):
+        # weakrefs cannot be ordered, even if the underlying objects can.
+        ops = [operator.lt, operator.gt, operator.le, operator.ge]
+        x = Object(1)
+        y = Object(1)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        for op in ops:
+            self.assertRaises(TypeError, op, a, b)
+        # Same when dead.
+        del x, y
+        gc.collect()
+        for op in ops:
+            self.assertRaises(TypeError, op, a, b)
+
+    def test_hashing(self):
+        # Alive weakrefs hash the same as the underlying object
+        x = Object(42)
+        y = Object(42)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        self.assertEqual(hash(a), hash(42))
+        del x, y
+        gc.collect()
+        # Dead weakrefs:
+        # - retain their hash is they were hashed when alive;
+        # - otherwise, cannot be hashed.
+        self.assertEqual(hash(a), hash(42))
+        self.assertRaises(TypeError, hash, b)
+
 
 class SubclassableWeakrefTestCase(TestBase):
 
@@ -796,27 +880,6 @@
         self.assertEqual(self.cbcalled, 0)
 
 
-class Object:
-    def __init__(self, arg):
-        self.arg = arg
-    def __repr__(self):
-        return "<Object %r>" % self.arg
-    def __eq__(self, other):
-        if isinstance(other, Object):
-            return self.arg == other.arg
-        return NotImplemented
-    def __lt__(self, other):
-        if isinstance(other, Object):
-            return self.arg < other.arg
-        return NotImplemented
-    def __hash__(self):
-        return hash(self.arg)
-
-class RefCycle:
-    def __init__(self):
-        self.cycle = self
-
-
 class MappingTestCase(TestBase):
 
     COUNT = 10
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16453: Fix equality testing of dead weakref objects.
+
 - Issue #9535: Fix pending signals that have been received but not yet
   handled by Python to not persist after os.fork() in the child process.
 
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -198,9 +198,13 @@
     }
     if (PyWeakref_GET_OBJECT(self) == Py_None
         || PyWeakref_GET_OBJECT(other) == Py_None) {
-        PyObject *res = self==other ? Py_True : Py_False;
-        Py_INCREF(res);
-        return res;
+        int res = (self == other);
+        if (op == Py_NE)
+            res = !res;
+        if (res)
+            Py_RETURN_TRUE;
+        else
+            Py_RETURN_FALSE;
     }
     return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
                                 PyWeakref_GET_OBJECT(other), op);

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

From python-checkins at python.org  Sun Nov 11 19:42:06 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:42:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?=
	=?utf-8?q?_Merge_heads?=
Message-ID: <3Y03qL35SXzRDm@mail.python.org>

http://hg.python.org/cpython/rev/8a28c974f903
changeset:   80397:8a28c974f903
branch:      3.2
parent:      80394:590f1b55abea
parent:      80390:d09b6cb719b5
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:40:38 2012 +0100
summary:
  Merge heads

files:
  Lib/test/test_subprocess.py |  37 ++++++++++++------------
  1 files changed, 18 insertions(+), 19 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
@@ -1035,22 +1035,15 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise RuntimeError("force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(*args, **kwargs):
+        def _execute_child(self, *args, **kwargs):
             try:
-                subprocess.Popen._execute_child(p, *args, **kwargs)
+                subprocess.Popen._execute_child(self, *args, **kwargs)
             finally:
                 # Open a bunch of file descriptors and verify that
                 # none of them are the same as the ones the Popen
@@ -1059,17 +1052,23 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (
-                                p.stdin.fileno(), p.stdout.fileno(),
-                                p.stderr.fileno()),
+                        self._testcase.assertNotIn(
+                                fd, (self.stdin.fileno(), self.stdout.fileno(),
+                                     self.stderr.fileno()),
                                 msg="At least one fd was closed early.")
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(RuntimeError):
-            p.RealPopen([sys.executable, "-c", "pass"],
+            self._TestExecuteChildPopen(
+                        self, [sys.executable, "-c", "pass"],
                         stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE, preexec_fn=raise_it)
 

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

From python-checkins at python.org  Sun Nov 11 19:42:07 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:42:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_Merge_heads?=
Message-ID: <3Y03qM5LX6zRHm@mail.python.org>

http://hg.python.org/cpython/rev/e75945ac0bed
changeset:   80398:e75945ac0bed
branch:      3.3
parent:      80395:c00e2c1cb3a7
parent:      80391:1fddd68b3658
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:40:49 2012 +0100
summary:
  Merge heads

files:
  Lib/test/test_subprocess.py |  37 ++++++++++++------------
  1 files changed, 18 insertions(+), 19 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
@@ -1189,22 +1189,15 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise RuntimeError("force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(*args, **kwargs):
+        def _execute_child(self, *args, **kwargs):
             try:
-                subprocess.Popen._execute_child(p, *args, **kwargs)
+                subprocess.Popen._execute_child(self, *args, **kwargs)
             finally:
                 # Open a bunch of file descriptors and verify that
                 # none of them are the same as the ones the Popen
@@ -1213,17 +1206,23 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (
-                                p.stdin.fileno(), p.stdout.fileno(),
-                                p.stderr.fileno()),
+                        self._testcase.assertNotIn(
+                                fd, (self.stdin.fileno(), self.stdout.fileno(),
+                                     self.stderr.fileno()),
                                 msg="At least one fd was closed early.")
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise RuntimeError("force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(RuntimeError):
-            p.RealPopen([sys.executable, "-c", "pass"],
+            self._TestExecuteChildPopen(
+                        self, [sys.executable, "-c", "pass"],
                         stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE, preexec_fn=raise_it)
 

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

From python-checkins at python.org  Sun Nov 11 19:42:09 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:42:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_Merge_heads?=
Message-ID: <3Y03qP0TYRzRGZ@mail.python.org>

http://hg.python.org/cpython/rev/3fa77d4d65b3
changeset:   80399:3fa77d4d65b3
parent:      80396:9e80ea48ff39
parent:      80392:c971687e5c66
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:41:09 2012 +0100
summary:
  Merge heads

files:
  Lib/test/test_subprocess.py |  39 ++++++++++++------------
  1 files changed, 19 insertions(+), 20 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
@@ -1189,23 +1189,15 @@
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
-    def test_preexec_errpipe_does_not_double_close_pipes(self):
-        """Issue16140: Don't double close pipes on preexec error."""
-        class SafeConstructorPopen(subprocess.Popen):
-            def __init__(self):
-                pass  # Do nothing so we can modify the instance for testing.
-            def RealPopen(self, *args, **kwargs):
-                subprocess.Popen.__init__(self, *args, **kwargs)
-        def raise_it():
-            raise subprocess.SubprocessError(
-                    "force the _execute_child() errpipe_data path.")
+    class _TestExecuteChildPopen(subprocess.Popen):
+        """Used to test behavior at the end of _execute_child."""
+        def __init__(self, testcase, *args, **kwargs):
+            self._testcase = testcase
+            subprocess.Popen.__init__(self, *args, **kwargs)
 
-        p = SafeConstructorPopen()
-
-        def _test_fds_execute_child_wrapper(*args, **kwargs):
+        def _execute_child(self, *args, **kwargs):
             try:
-                subprocess.Popen._execute_child(p, *args, **kwargs)
+                subprocess.Popen._execute_child(self, *args, **kwargs)
             finally:
                 # Open a bunch of file descriptors and verify that
                 # none of them are the same as the ones the Popen
@@ -1214,17 +1206,24 @@
                                for _ in range(8)]
                 try:
                     for fd in devzero_fds:
-                        self.assertNotIn(fd, (
-                                p.stdin.fileno(), p.stdout.fileno(),
-                                p.stderr.fileno()),
+                        self._testcase.assertNotIn(
+                                fd, (self.stdin.fileno(), self.stdout.fileno(),
+                                     self.stderr.fileno()),
                                 msg="At least one fd was closed early.")
                 finally:
                     map(os.close, devzero_fds)
 
-        p._execute_child = _test_fds_execute_child_wrapper
+    @unittest.skipIf(not os.path.exists("/dev/zero"), "/dev/zero required.")
+    def test_preexec_errpipe_does_not_double_close_pipes(self):
+        """Issue16140: Don't double close pipes on preexec error."""
+
+        def raise_it():
+            raise subprocess.SubprocessError(
+                    "force the _execute_child() errpipe_data path.")
 
         with self.assertRaises(subprocess.SubprocessError):
-            p.RealPopen([sys.executable, "-c", "pass"],
+            self._TestExecuteChildPopen(
+                        self, [sys.executable, "-c", "pass"],
                         stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE, preexec_fn=raise_it)
 

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

From python-checkins at python.org  Sun Nov 11 19:49:07 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 19:49:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2NDUz?=
 =?utf-8?q?=3A_Fix_equality_testing_of_dead_weakref_objects=2E?=
Message-ID: <3Y03zR1nMkzRFq@mail.python.org>

http://hg.python.org/cpython/rev/13b74c0b040c
changeset:   80400:13b74c0b040c
branch:      2.7
parent:      80393:677cf4a55a9c
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 19:36:51 2012 +0100
summary:
  Issue #16453: Fix equality testing of dead weakref objects.
Also add tests for hashing.

files:
  Lib/test/test_weakref.py |  80 ++++++++++++++++++++++++---
  Misc/NEWS                |   2 +
  Objects/weakrefobject.c  |  12 ++-
  3 files changed, 79 insertions(+), 15 deletions(-)


diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -33,6 +33,27 @@
     return C.method
 
 
+class Object:
+    def __init__(self, arg):
+        self.arg = arg
+    def __repr__(self):
+        return "<Object %r>" % self.arg
+    def __eq__(self, other):
+        if isinstance(other, Object):
+            return self.arg == other.arg
+        return NotImplemented
+    def __ne__(self, other):
+        if isinstance(other, Object):
+            return self.arg != other.arg
+        return NotImplemented
+    def __hash__(self):
+        return hash(self.arg)
+
+class RefCycle:
+    def __init__(self):
+        self.cycle = self
+
+
 class TestBase(unittest.TestCase):
 
     def setUp(self):
@@ -705,6 +726,54 @@
         self.assertEqual(b(), None)
         self.assertEqual(l, [a, b])
 
+    def test_equality(self):
+        # Alive weakrefs defer equality testing to their underlying object.
+        x = Object(1)
+        y = Object(1)
+        z = Object(2)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        c = weakref.ref(z)
+        d = weakref.ref(x)
+        # Note how we directly test the operators here, to stress both
+        # __eq__ and __ne__.
+        self.assertTrue(a == b)
+        self.assertFalse(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertTrue(a == d)
+        self.assertFalse(a != d)
+        del x, y, z
+        gc.collect()
+        for r in a, b, c:
+            # Sanity check
+            self.assertIs(r(), None)
+        # Dead weakrefs compare by identity: whether `a` and `d` are the
+        # same weakref object is an implementation detail, since they pointed
+        # to the same original object and didn't have a callback.
+        # (see issue #16453).
+        self.assertFalse(a == b)
+        self.assertTrue(a != b)
+        self.assertFalse(a == c)
+        self.assertTrue(a != c)
+        self.assertEqual(a == d, a is d)
+        self.assertEqual(a != d, a is not d)
+
+    def test_hashing(self):
+        # Alive weakrefs hash the same as the underlying object
+        x = Object(42)
+        y = Object(42)
+        a = weakref.ref(x)
+        b = weakref.ref(y)
+        self.assertEqual(hash(a), hash(42))
+        del x, y
+        gc.collect()
+        # Dead weakrefs:
+        # - retain their hash is they were hashed when alive;
+        # - otherwise, cannot be hashed.
+        self.assertEqual(hash(a), hash(42))
+        self.assertRaises(TypeError, hash, b)
+
 
 class SubclassableWeakrefTestCase(TestBase):
 
@@ -809,17 +878,6 @@
         self.assertEqual(self.cbcalled, 0)
 
 
-class Object:
-    def __init__(self, arg):
-        self.arg = arg
-    def __repr__(self):
-        return "<Object %r>" % self.arg
-
-class RefCycle:
-    def __init__(self):
-        self.cycle = self
-
-
 class MappingTestCase(TestBase):
 
     COUNT = 10
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16453: Fix equality testing of dead weakref objects.
+
 - Issue #9535: Fix pending signals that have been received but not yet
   handled by Python to not persist after os.fork() in the child process.
 
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -187,15 +187,19 @@
 static PyObject *
 weakref_richcompare(PyWeakReference* self, PyWeakReference* other, int op)
 {
-    if (op != Py_EQ || self->ob_type != other->ob_type) {
+    if ((op != Py_EQ && op != Py_NE) || self->ob_type != other->ob_type) {
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
     if (PyWeakref_GET_OBJECT(self) == Py_None
         || PyWeakref_GET_OBJECT(other) == Py_None) {
-        PyObject *res = self==other ? Py_True : Py_False;
-        Py_INCREF(res);
-        return res;
+        int res = (self == other);
+        if (op == Py_NE)
+            res = !res;
+        if (res)
+            Py_RETURN_TRUE;
+        else
+            Py_RETURN_FALSE;
     }
     return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
                                 PyWeakref_GET_OBJECT(other), op);

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

From python-checkins at python.org  Sun Nov 11 20:12:05 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 20:12:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_a_test_for?=
 =?utf-8?q?_hashing_of_unaligned_memory_buffers_=28from_issue_=2316427=29?=
 =?utf-8?q?=2E?=
Message-ID: <3Y04Tx1Sj4zRCr@mail.python.org>

http://hg.python.org/cpython/rev/797de1864fd9
changeset:   80401:797de1864fd9
branch:      3.3
parent:      80398:e75945ac0bed
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 20:10:48 2012 +0100
summary:
  Add a test for hashing of unaligned memory buffers (from issue #16427).

files:
  Lib/test/test_hash.py |  10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_hash.py b/Lib/test/test_hash.py
--- a/Lib/test/test_hash.py
+++ b/Lib/test/test_hash.py
@@ -45,6 +45,16 @@
         self.same_hash(int(1.23e300), float(1.23e300))
         self.same_hash(float(0.5), complex(0.5, 0.0))
 
+    def test_unaligned_buffers(self):
+        # The hash function for bytes-like objects shouldn't have
+        # alignment-dependent results (example in issue #16427).
+        b = b"123456789abcdefghijklmnopqrstuvwxyz" * 128
+        for i in range(16):
+            for j in range(16):
+                aligned = b[i:128+j]
+                unaligned = memoryview(b)[i:128+j]
+                self.assertEqual(hash(aligned), hash(unaligned))
+
 
 _default_hash = object.__hash__
 class DefaultHash(object): pass

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

From python-checkins at python.org  Sun Nov 11 20:12:06 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 11 Nov 2012 20:12:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Add_a_test_for_hashing_of_unaligned_memory_buffers_=28fr?=
 =?utf-8?q?om_issue_=2316427=29=2E?=
Message-ID: <3Y04Ty3mYxzRH6@mail.python.org>

http://hg.python.org/cpython/rev/9cb1366b251b
changeset:   80402:9cb1366b251b
parent:      80399:3fa77d4d65b3
parent:      80401:797de1864fd9
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 11 20:11:15 2012 +0100
summary:
  Add a test for hashing of unaligned memory buffers (from issue #16427).

files:
  Lib/test/test_hash.py |  10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_hash.py b/Lib/test/test_hash.py
--- a/Lib/test/test_hash.py
+++ b/Lib/test/test_hash.py
@@ -45,6 +45,16 @@
         self.same_hash(int(1.23e300), float(1.23e300))
         self.same_hash(float(0.5), complex(0.5, 0.0))
 
+    def test_unaligned_buffers(self):
+        # The hash function for bytes-like objects shouldn't have
+        # alignment-dependent results (example in issue #16427).
+        b = b"123456789abcdefghijklmnopqrstuvwxyz" * 128
+        for i in range(16):
+            for j in range(16):
+                aligned = b[i:128+j]
+                unaligned = memoryview(b)[i:128+j]
+                self.assertEqual(hash(aligned), hash(unaligned))
+
 
 _default_hash = object.__hash__
 class DefaultHash(object): pass

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

From python-checkins at python.org  Mon Nov 12 01:24:16 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon, 12 Nov 2012 01:24:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MjE4?=
 =?utf-8?q?=2C_=2316444=3A_Backport_improvment_on_tests_for_non-ASCII_char?=
 =?utf-8?q?acters?=
Message-ID: <3Y0CQ8664BzRJs@mail.python.org>

http://hg.python.org/cpython/rev/6017f09ead53
changeset:   80403:6017f09ead53
branch:      3.3
parent:      80401:797de1864fd9
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 12 01:23:15 2012 +0100
summary:
  Issue #16218, #16444: Backport improvment on tests for non-ASCII characters

files:
  Lib/test/support.py              |  75 ++++++++++++++++++++
  Lib/test/test_cmd_line.py        |   6 +-
  Lib/test/test_cmd_line_script.py |  30 ++++++-
  Lib/test/test_os.py              |   4 +
  4 files changed, 105 insertions(+), 10 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -603,6 +603,49 @@
 # module name.
 TESTFN = "{}_{}_tmp".format(TESTFN, os.getpid())
 
+# FS_NONASCII: non-ASCII character encodable by os.fsencode(),
+# or None if there is no such character.
+FS_NONASCII = None
+for character in (
+    # First try printable and common characters to have a readable filename.
+    # For each character, the encoding list are just example of encodings able
+    # to encode the character (the list is not exhaustive).
+
+    # U+00E6 (Latin Small Letter Ae): cp1252, iso-8859-1
+    '\u00E6',
+    # U+0130 (Latin Capital Letter I With Dot Above): cp1254, iso8859_3
+    '\u0130',
+    # U+0141 (Latin Capital Letter L With Stroke): cp1250, cp1257
+    '\u0141',
+    # U+03C6 (Greek Small Letter Phi): cp1253
+    '\u03C6',
+    # U+041A (Cyrillic Capital Letter Ka): cp1251
+    '\u041A',
+    # U+05D0 (Hebrew Letter Alef): Encodable to cp424
+    '\u05D0',
+    # U+060C (Arabic Comma): cp864, cp1006, iso8859_6, mac_arabic
+    '\u060C',
+    # U+062A (Arabic Letter Teh): cp720
+    '\u062A',
+    # U+0E01 (Thai Character Ko Kai): cp874
+    '\u0E01',
+
+    # Then try more "special" characters. "special" because they may be
+    # interpreted or displayed differently depending on the exact locale
+    # encoding and the font.
+
+    # U+00A0 (No-Break Space)
+    '\u00A0',
+    # U+20AC (Euro Sign)
+    '\u20AC',
+):
+    try:
+        os.fsdecode(os.fsencode(character))
+    except UnicodeError:
+        pass
+    else:
+        FS_NONASCII = character
+        break
 
 # TESTFN_UNICODE is a non-ascii filename
 TESTFN_UNICODE = TESTFN + "-\xe0\xf2\u0258\u0141\u011f"
@@ -647,6 +690,38 @@
         # the byte 0xff. Skip some unicode filename tests.
         pass
 
+# TESTFN_UNDECODABLE is a filename (bytes type) that should *not* be able to be
+# decoded from the filesystem encoding (in strict mode). It can be None if we
+# cannot generate such filename (ex: the latin1 encoding can decode any byte
+# sequence). On UNIX, TESTFN_UNDECODABLE can be decoded by os.fsdecode() thanks
+# to the surrogateescape error handler (PEP 383), but not from the filesystem
+# encoding in strict mode.
+TESTFN_UNDECODABLE = None
+for name in (
+    # b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
+    # accepts it to create a file or a directory, or don't accept to enter to
+    # such directory (when the bytes name is used). So test b'\xe7' first: it is
+    # not decodable from cp932.
+    b'\xe7w\xf0',
+    # undecodable from ASCII, UTF-8
+    b'\xff',
+    # undecodable from iso8859-3, iso8859-6, iso8859-7, cp424, iso8859-8, cp856
+    # and cp857
+    b'\xae\xd5'
+    # undecodable from UTF-8 (UNIX and Mac OS X)
+    b'\xed\xb2\x80', b'\xed\xb4\x80',
+):
+    try:
+        name.decode(TESTFN_ENCODING)
+    except UnicodeDecodeError:
+        TESTFN_UNDECODABLE = os.fsencode(TESTFN) + name
+        break
+
+if FS_NONASCII:
+    TESTFN_NONASCII = TESTFN + '-' + FS_NONASCII
+else:
+    TESTFN_NONASCII = None
+
 # Save the initial cwd
 SAVEDCWD = os.getcwd()
 
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -93,15 +93,15 @@
         # All good if execution is successful
         assert_python_ok('-c', 'pass')
 
-    @unittest.skipIf(sys.getfilesystemencoding() == 'ascii',
-                     'need a filesystem encoding different than ASCII')
+    @unittest.skipUnless(test.support.FS_NONASCII, 'need support.FS_NONASCII')
     def test_non_ascii(self):
         # Test handling of non-ascii data
         if test.support.verbose:
             import locale
             print('locale encoding = %s, filesystem encoding = %s'
                   % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
-        command = "assert(ord('\xe9') == 0xe9)"
+        command = ("assert(ord(%r) == %s)"
+                   % (test.support.FS_NONASCII, ord(test.support.FS_NONASCII)))
         assert_python_ok('-c', command)
 
     # On Windows, pass bytes to subprocess doesn't test how Python decodes the
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -363,14 +363,30 @@
             self.assertTrue(text[1].startswith('  File '))
             self.assertTrue(text[3].startswith('NameError'))
 
-    def test_non_utf8(self):
+    def test_non_ascii(self):
+        # Mac OS X denies the creation of a file with an invalid UTF-8 name.
+        # Windows allows to create a name with an arbitrary bytes name, but
+        # Python cannot a undecodable bytes argument to a subprocess.
+        #if (support.TESTFN_UNDECODABLE
+        #and sys.platform not in ('win32', 'darwin')):
+        #    name = os.fsdecode(support.TESTFN_UNDECODABLE)
+        #elif support.TESTFN_NONASCII:
+        if support.TESTFN_NONASCII:
+            name = support.TESTFN_NONASCII
+        else:
+            self.skipTest("need support.TESTFN_NONASCII")
+
         # Issue #16218
-        with temp_dir() as script_dir:
-            script_name = _make_test_script(script_dir,
-                    '\udcf1\udcea\udcf0\udce8\udcef\udcf2')
-            self._check_script(script_name, script_name, script_name,
-                               script_dir, None,
-                               importlib.machinery.SourceFileLoader)
+        source = 'print(ascii(__file__))\n'
+        script_name = _make_test_script(os.curdir, name, source)
+        self.addCleanup(support.unlink, script_name)
+        rc, stdout, stderr = assert_python_ok(script_name)
+        self.assertEqual(
+            ascii(script_name),
+            stdout.rstrip().decode('ascii'),
+            'stdout=%r stderr=%r' % (stdout, stderr))
+        self.assertEqual(0, rc)
+
 
 def test_main():
     support.run_unittest(CmdLineTest)
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
@@ -1243,6 +1243,8 @@
         def setUp(self):
             if support.TESTFN_UNENCODABLE:
                 self.dir = support.TESTFN_UNENCODABLE
+            elif support.TESTFN_NONASCII:
+                self.dir = support.TESTFN_NONASCII
             else:
                 self.dir = support.TESTFN
             self.bdir = os.fsencode(self.dir)
@@ -1257,6 +1259,8 @@
             add_filename(support.TESTFN_UNICODE)
             if support.TESTFN_UNENCODABLE:
                 add_filename(support.TESTFN_UNENCODABLE)
+            if support.TESTFN_NONASCII:
+                add_filename(support.TESTFN_NONASCII)
             if not bytesfn:
                 self.skipTest("couldn't create any non-ascii filename")
 

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

From python-checkins at python.org  Mon Nov 12 01:24:18 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon, 12 Nov 2012 01:24:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_3=2E3=3A_null_merge?=
Message-ID: <3Y0CQB1Kp3zRK3@mail.python.org>

http://hg.python.org/cpython/rev/6a6ad09faad2
changeset:   80404:6a6ad09faad2
parent:      80402:9cb1366b251b
parent:      80403:6017f09ead53
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 12 01:23:51 2012 +0100
summary:
  Merge 3.3: null merge

files:



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

From solipsis at pitrou.net  Mon Nov 12 05:54:59 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 12 Nov 2012 05:54:59 +0100
Subject: [Python-checkins] Daily reference leaks (6a6ad09faad2): sum=0
Message-ID: <E1TXm31-00089f-3j@ap.vmr.nerim.net>

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



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

From python-checkins at python.org  Mon Nov 12 19:26:05 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 12 Nov 2012 19:26:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogVXNlIDIueCAicHJp?=
 =?utf-8?q?nt=22_syntax_for_this_example=2E?=
Message-ID: <3Y0gQP6NMZzRHy@mail.python.org>

http://hg.python.org/cpython/rev/121872879e91
changeset:   80405:121872879e91
branch:      2.7
parent:      80400:13b74c0b040c
user:        Georg Brandl <georg at python.org>
date:        Mon Nov 12 19:25:55 2012 +0100
summary:
  Use 2.x "print" syntax for this example.

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


diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -168,9 +168,9 @@
 
     >>> for num in range(2, 10):
     ...     if num % 2 == 0:
-    ...         print("Found an even number", num)
+    ...         print "Found an even number", num
     ...         continue
-    ...     print("Found a number", num)
+    ...     print "Found a number", num
     Found an even number 2
     Found a number 3
     Found an even number 4
@@ -180,6 +180,7 @@
     Found an even number 8
     Found a number 9
 
+
 .. _tut-pass:
 
 :keyword:`pass` Statements

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

From python-checkins at python.org  Mon Nov 12 20:37:09 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 12 Nov 2012 20:37:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE1ODM1?=
 =?utf-8?q?=3A_Define_PATH=5FMAX_on_HP-UX=2E?=
Message-ID: <3Y0j0P45xhzRFC@mail.python.org>

http://hg.python.org/cpython/rev/5db6d9ddf6e8
changeset:   80406:5db6d9ddf6e8
branch:      3.3
parent:      80403:6017f09ead53
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 12 20:14:36 2012 +0100
summary:
  Issue #15835: Define PATH_MAX on HP-UX.

files:
  Include/osdefs.h   |  8 ++++++++
  Python/fileutils.c |  1 +
  2 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Include/osdefs.h b/Include/osdefs.h
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -29,6 +29,14 @@
 #endif
 
 /* Max pathname length */
+#ifdef __hpux
+#include <sys/param.h>
+#include <limits.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAXPATHLEN
+#endif
+#endif
+
 #ifndef MAXPATHLEN
 #if defined(PATH_MAX) && PATH_MAX > 1024
 #define MAXPATHLEN PATH_MAX
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1,4 +1,5 @@
 #include "Python.h"
+#include "osdefs.h"
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #endif

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

From python-checkins at python.org  Mon Nov 12 20:37:10 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 12 Nov 2012 20:37:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3Y0j0Q6WTYzRKR@mail.python.org>

http://hg.python.org/cpython/rev/3857a63cf840
changeset:   80407:3857a63cf840
parent:      80404:6a6ad09faad2
parent:      80406:5db6d9ddf6e8
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 12 20:24:09 2012 +0100
summary:
  Merge 3.3.

files:
  Include/osdefs.h   |  8 ++++++++
  Python/fileutils.c |  1 +
  2 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Include/osdefs.h b/Include/osdefs.h
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -23,6 +23,14 @@
 #endif
 
 /* Max pathname length */
+#ifdef __hpux
+#include <sys/param.h>
+#include <limits.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAXPATHLEN
+#endif
+#endif
+
 #ifndef MAXPATHLEN
 #if defined(PATH_MAX) && PATH_MAX > 1024
 #define MAXPATHLEN PATH_MAX
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1,4 +1,5 @@
 #include "Python.h"
+#include "osdefs.h"
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #endif

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

From python-checkins at python.org  Mon Nov 12 20:37:12 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 12 Nov 2012 20:37:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_5db6d?=
	=?utf-8?q?9ddf6e8=2E?=
Message-ID: <3Y0j0S1xrWzRLw@mail.python.org>

http://hg.python.org/cpython/rev/bb21c800cf49
changeset:   80408:bb21c800cf49
branch:      2.7
parent:      80405:121872879e91
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 12 20:35:29 2012 +0100
summary:
  Backport 5db6d9ddf6e8.

files:
  Include/osdefs.h |  8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/Include/osdefs.h b/Include/osdefs.h
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -36,6 +36,14 @@
 #endif
 
 /* Max pathname length */
+#ifdef __hpux
+#include <sys/param.h>
+#include <limits.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAXPATHLEN
+#endif
+#endif
+
 #ifndef MAXPATHLEN
 #if defined(PATH_MAX) && PATH_MAX > 1024
 #define MAXPATHLEN PATH_MAX

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

From python-checkins at python.org  Mon Nov 12 22:48:31 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Mon, 12 Nov 2012 22:48:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_missing_letter?=
Message-ID: <3Y0lvz4rG3zPsn@mail.python.org>

http://hg.python.org/cpython/rev/58d6fea0c0c7
changeset:   80409:58d6fea0c0c7
branch:      3.3
parent:      80406:5db6d9ddf6e8
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 12 16:48:17 2012 -0500
summary:
  missing letter

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


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1159,7 +1159,7 @@
     """Represents a namespace package's path.  It uses the module name
     to find its parent module, and from there it looks up the parent's
     __path__.  When this changes, the module's own path is recomputed,
-    using path_finder.  For top-leve modules, the parent module's path
+    using path_finder.  For top-level modules, the parent module's path
     is sys.path."""
 
     def __init__(self, name, path, path_finder):

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

From python-checkins at python.org  Mon Nov 12 22:48:33 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Mon, 12 Nov 2012 22:48:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4z?=
Message-ID: <3Y0lw109bVzPxS@mail.python.org>

http://hg.python.org/cpython/rev/9a984c051cde
changeset:   80410:9a984c051cde
parent:      80407:3857a63cf840
parent:      80409:58d6fea0c0c7
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 12 16:48:25 2012 -0500
summary:
  merge 3.3

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


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1159,7 +1159,7 @@
     """Represents a namespace package's path.  It uses the module name
     to find its parent module, and from there it looks up the parent's
     __path__.  When this changes, the module's own path is recomputed,
-    using path_finder.  For top-leve modules, the parent module's path
+    using path_finder.  For top-level modules, the parent module's path
     is sys.path."""
 
     def __init__(self, name, path, path_finder):

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

From python-checkins at python.org  Mon Nov 12 23:03:45 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon, 12 Nov 2012 23:03:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316416=3A_OS_data_?=
 =?utf-8?q?are_now_always_encoded/decoded_to/from?=
Message-ID: <3Y0mFY3pjgzQ8T@mail.python.org>

http://hg.python.org/cpython/rev/48fbdaf3a849
changeset:   80411:48fbdaf3a849
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 12 23:04:02 2012 +0100
summary:
  Issue #16416: OS data are now always encoded/decoded to/from
UTF-8/surrogateescape, instead of the locale encoding (which may be ASCII if no
locale environment variable is set), to avoid inconsistencies with
os.fsencode() and os.fsdecode() functions which are already using
UTF-8/surrogateescape.

files:
  Misc/NEWS          |   6 ++++
  Modules/python.c   |   8 -----
  Python/fileutils.c |  47 ++++++++++++++++++++++++++++++++-
  3 files changed, 51 insertions(+), 10 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,12 @@
 Core and Builtins
 -----------------
 
+- Issue #16416: OS data are now always encoded/decoded to/from
+  UTF-8/surrogateescape, instead of the locale encoding (which may be ASCII if
+  no locale environment variable is set), to avoid inconsistencies with
+  os.fsencode() and os.fsdecode() functions which are already using
+  UTF-8/surrogateescape.
+
 - Issue #16453: Fix equality testing of dead weakref objects.
 
 - Issue #9535: Fix pending signals that have been received but not yet
diff --git a/Modules/python.c b/Modules/python.c
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -15,10 +15,6 @@
 }
 #else
 
-#ifdef __APPLE__
-extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
-#endif
-
 int
 main(int argc, char **argv)
 {
@@ -45,11 +41,7 @@
     oldloc = strdup(setlocale(LC_ALL, NULL));
     setlocale(LC_ALL, "");
     for (i = 0; i < argc; i++) {
-#ifdef __APPLE__
-        argv_copy[i] = _Py_DecodeUTF8_surrogateescape(argv[i], strlen(argv[i]));
-#else
         argv_copy[i] = _Py_char2wchar(argv[i], NULL);
-#endif
         if (!argv_copy[i]) {
             free(oldloc);
             fprintf(stderr, "Fatal Python error: "
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -8,6 +8,10 @@
 #include <langinfo.h>
 #endif
 
+#ifdef __APPLE__
+extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
+#endif
+
 PyObject *
 _Py_device_encoding(int fd)
 {
@@ -60,6 +64,15 @@
 wchar_t*
 _Py_char2wchar(const char* arg, size_t *size)
 {
+#ifdef __APPLE__
+    wchar_t *wstr;
+    wstr = _Py_DecodeUTF8_surrogateescape(arg, strlen(arg));
+    if (wstr == NULL)
+        return NULL;
+    if (size != NULL)
+        *size = wcslen(wstr);
+    return wstr;
+#else
     wchar_t *res;
 #ifdef HAVE_BROKEN_MBSTOWCS
     /* Some platforms have a broken implementation of
@@ -145,7 +158,7 @@
         argsize -= converted;
         out++;
     }
-#else
+#else   /* HAVE_MBRTOWC */
     /* Cannot use C locale for escaping; manually escape as if charset
        is ASCII (i.e. escape all bytes > 128. This will still roundtrip
        correctly in the locale's charset, which must be an ASCII superset. */
@@ -160,7 +173,7 @@
         else
             *out++ = 0xdc00 + *in++;
     *out = 0;
-#endif
+#endif   /* HAVE_MBRTOWC */
     if (size != NULL)
         *size = out - res;
     return res;
@@ -168,6 +181,7 @@
     if (size != NULL)
         *size = (size_t)-1;
     return NULL;
+#endif   /* __APPLE__ */
 }
 
 /* Encode a (wide) character string to the locale encoding with the
@@ -184,6 +198,34 @@
 char*
 _Py_wchar2char(const wchar_t *text, size_t *error_pos)
 {
+#ifdef __APPLE__
+    Py_ssize_t len;
+    PyObject *unicode, *bytes = NULL;
+    char *cpath;
+
+    unicode = PyUnicode_FromWideChar(text, wcslen(text));
+    if (unicode == NULL) {
+        Py_DECREF(unicode);
+        return NULL;
+    }
+
+    bytes = _PyUnicode_AsUTF8String(unicode, "surrogateescape");
+    Py_DECREF(unicode);
+    if (bytes == NULL) {
+        PyErr_Clear();
+        return NULL;
+    }
+
+    len = PyBytes_GET_SIZE(bytes);
+    cpath = PyMem_Malloc(len+1);
+    if (cpath == NULL) {
+        Py_DECREF(bytes);
+        return NULL;
+    }
+    memcpy(cpath, PyBytes_AsString(bytes), len + 1);
+    Py_DECREF(bytes);
+    return cpath;
+#else   /* __APPLE__ */
     const size_t len = wcslen(text);
     char *result = NULL, *bytes = NULL;
     size_t i, size, converted;
@@ -243,6 +285,7 @@
         bytes = result;
     }
     return result;
+#endif   /* __APPLE__ */
 }
 
 /* In principle, this should use HAVE__WSTAT, and _wstat

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

From python-checkins at python.org  Mon Nov 12 23:04:49 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Mon, 12 Nov 2012 23:04:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_recompile_impo?=
	=?utf-8?q?rtlib=2Eh?=
Message-ID: <3Y0mGn244BzQBX@mail.python.org>

http://hg.python.org/cpython/rev/59ea4a473e2a
changeset:   80412:59ea4a473e2a
branch:      3.3
parent:      80409:58d6fea0c0c7
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 12 17:02:32 2012 -0500
summary:
  recompile importlib.h

files:
  Python/importlib.h |  3100 ++++++++++++++++----------------
  1 files changed, 1550 insertions(+), 1550 deletions(-)


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  Mon Nov 12 23:04:50 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Mon, 12 Nov 2012 23:04:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_merge_3=2E3_=28sort_of=29?=
Message-ID: <3Y0mGp4ZVLzQKB@mail.python.org>

http://hg.python.org/cpython/rev/e82acc646d3e
changeset:   80413:e82acc646d3e
parent:      80410:9a984c051cde
parent:      80412:59ea4a473e2a
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 12 17:04:28 2012 -0500
summary:
  merge 3.3 (sort of)

files:
  Python/importlib.h |  3086 ++++++++++++++++----------------
  1 files changed, 1543 insertions(+), 1543 deletions(-)


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  Mon Nov 12 23:04:52 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Mon, 12 Nov 2012 23:04:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3Y0mGr0sy8zQKc@mail.python.org>

http://hg.python.org/cpython/rev/f652b51dee08
changeset:   80414:f652b51dee08
parent:      80413:e82acc646d3e
parent:      80411:48fbdaf3a849
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 12 17:04:43 2012 -0500
summary:
  merge heads

files:
  Misc/NEWS          |   6 ++++
  Modules/python.c   |   8 -----
  Python/fileutils.c |  47 ++++++++++++++++++++++++++++++++-
  3 files changed, 51 insertions(+), 10 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,12 @@
 Core and Builtins
 -----------------
 
+- Issue #16416: OS data are now always encoded/decoded to/from
+  UTF-8/surrogateescape, instead of the locale encoding (which may be ASCII if
+  no locale environment variable is set), to avoid inconsistencies with
+  os.fsencode() and os.fsdecode() functions which are already using
+  UTF-8/surrogateescape.
+
 - Issue #16453: Fix equality testing of dead weakref objects.
 
 - Issue #9535: Fix pending signals that have been received but not yet
diff --git a/Modules/python.c b/Modules/python.c
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -15,10 +15,6 @@
 }
 #else
 
-#ifdef __APPLE__
-extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
-#endif
-
 int
 main(int argc, char **argv)
 {
@@ -45,11 +41,7 @@
     oldloc = strdup(setlocale(LC_ALL, NULL));
     setlocale(LC_ALL, "");
     for (i = 0; i < argc; i++) {
-#ifdef __APPLE__
-        argv_copy[i] = _Py_DecodeUTF8_surrogateescape(argv[i], strlen(argv[i]));
-#else
         argv_copy[i] = _Py_char2wchar(argv[i], NULL);
-#endif
         if (!argv_copy[i]) {
             free(oldloc);
             fprintf(stderr, "Fatal Python error: "
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -8,6 +8,10 @@
 #include <langinfo.h>
 #endif
 
+#ifdef __APPLE__
+extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
+#endif
+
 PyObject *
 _Py_device_encoding(int fd)
 {
@@ -60,6 +64,15 @@
 wchar_t*
 _Py_char2wchar(const char* arg, size_t *size)
 {
+#ifdef __APPLE__
+    wchar_t *wstr;
+    wstr = _Py_DecodeUTF8_surrogateescape(arg, strlen(arg));
+    if (wstr == NULL)
+        return NULL;
+    if (size != NULL)
+        *size = wcslen(wstr);
+    return wstr;
+#else
     wchar_t *res;
 #ifdef HAVE_BROKEN_MBSTOWCS
     /* Some platforms have a broken implementation of
@@ -145,7 +158,7 @@
         argsize -= converted;
         out++;
     }
-#else
+#else   /* HAVE_MBRTOWC */
     /* Cannot use C locale for escaping; manually escape as if charset
        is ASCII (i.e. escape all bytes > 128. This will still roundtrip
        correctly in the locale's charset, which must be an ASCII superset. */
@@ -160,7 +173,7 @@
         else
             *out++ = 0xdc00 + *in++;
     *out = 0;
-#endif
+#endif   /* HAVE_MBRTOWC */
     if (size != NULL)
         *size = out - res;
     return res;
@@ -168,6 +181,7 @@
     if (size != NULL)
         *size = (size_t)-1;
     return NULL;
+#endif   /* __APPLE__ */
 }
 
 /* Encode a (wide) character string to the locale encoding with the
@@ -184,6 +198,34 @@
 char*
 _Py_wchar2char(const wchar_t *text, size_t *error_pos)
 {
+#ifdef __APPLE__
+    Py_ssize_t len;
+    PyObject *unicode, *bytes = NULL;
+    char *cpath;
+
+    unicode = PyUnicode_FromWideChar(text, wcslen(text));
+    if (unicode == NULL) {
+        Py_DECREF(unicode);
+        return NULL;
+    }
+
+    bytes = _PyUnicode_AsUTF8String(unicode, "surrogateescape");
+    Py_DECREF(unicode);
+    if (bytes == NULL) {
+        PyErr_Clear();
+        return NULL;
+    }
+
+    len = PyBytes_GET_SIZE(bytes);
+    cpath = PyMem_Malloc(len+1);
+    if (cpath == NULL) {
+        Py_DECREF(bytes);
+        return NULL;
+    }
+    memcpy(cpath, PyBytes_AsString(bytes), len + 1);
+    Py_DECREF(bytes);
+    return cpath;
+#else   /* __APPLE__ */
     const size_t len = wcslen(text);
     char *result = NULL, *bytes = NULL;
     size_t i, size, converted;
@@ -243,6 +285,7 @@
         bytes = result;
     }
     return result;
+#endif   /* __APPLE__ */
 }
 
 /* In principle, this should use HAVE__WSTAT, and _wstat

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

From python-checkins at python.org  Mon Nov 12 23:48:35 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon, 12 Nov 2012 23:48:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316416=3A_Fix_erro?=
 =?utf-8?q?r_handling_in_=5FPy=5Fwchar2char=28=29_=5FPy=5Fchar2wchar=28=29?=
 =?utf-8?q?_functions?=
Message-ID: <3Y0nFH5v3hzPtC@mail.python.org>

http://hg.python.org/cpython/rev/f3e512b5ffb3
changeset:   80415:f3e512b5ffb3
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 12 23:32:21 2012 +0100
summary:
  Issue #16416: Fix error handling in _Py_wchar2char() _Py_char2wchar() functions

files:
  Objects/unicodeobject.c |  11 ++++++-----
  Python/fileutils.c      |  27 ++++++++++++++++-----------
  2 files changed, 22 insertions(+), 16 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4691,7 +4691,10 @@
 #ifdef __APPLE__
 
 /* Simplified UTF-8 decoder using surrogateescape error handler,
-   used to decode the command line arguments on Mac OS X. */
+   used to decode the command line arguments on Mac OS X.
+
+   Return a pointer to a newly allocated wide character string (use
+   PyMem_Free() to free the memory), or NULL on memory allocation error. */
 
 wchar_t*
 _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size)
@@ -4702,10 +4705,8 @@
 
     /* Note: size will always be longer than the resulting Unicode
        character count */
-    if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1)) {
-        PyErr_NoMemory();
-        return NULL;
-    }
+    if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1))
+        return NULL;
     unicode = PyMem_Malloc((size + 1) * sizeof(wchar_t));
     if (!unicode)
         return NULL;
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -67,10 +67,12 @@
 #ifdef __APPLE__
     wchar_t *wstr;
     wstr = _Py_DecodeUTF8_surrogateescape(arg, strlen(arg));
-    if (wstr == NULL)
-        return NULL;
-    if (size != NULL)
-        *size = wcslen(wstr);
+    if (size != NULL) {
+        if (wstr != NULL)
+            *size = wcslen(wstr);
+        else
+            *size = (size_t)-1;
+    }
     return wstr;
 #else
     wchar_t *res;
@@ -204,22 +206,25 @@
     char *cpath;
 
     unicode = PyUnicode_FromWideChar(text, wcslen(text));
-    if (unicode == NULL) {
-        Py_DECREF(unicode);
+    if (unicode == NULL)
         return NULL;
-    }
 
     bytes = _PyUnicode_AsUTF8String(unicode, "surrogateescape");
     Py_DECREF(unicode);
     if (bytes == NULL) {
         PyErr_Clear();
+        if (error_pos != NULL)
+            *error_pos = (size_t)-1;
         return NULL;
     }
 
     len = PyBytes_GET_SIZE(bytes);
     cpath = PyMem_Malloc(len+1);
     if (cpath == NULL) {
+        PyErr_Clear();
         Py_DECREF(bytes);
+        if (error_pos != NULL)
+            *error_pos = (size_t)-1;
         return NULL;
     }
     memcpy(cpath, PyBytes_AsString(bytes), len + 1);
@@ -231,9 +236,6 @@
     size_t i, size, converted;
     wchar_t c, buf[2];
 
-    if (error_pos != NULL)
-        *error_pos = (size_t)-1;
-
     /* The function works in two steps:
        1. compute the length of the output buffer in bytes (size)
        2. outputs the bytes */
@@ -280,8 +282,11 @@
 
         size += 1; /* nul byte at the end */
         result = PyMem_Malloc(size);
-        if (result == NULL)
+        if (result == NULL) {
+            if (error_pos != NULL)
+                *error_pos = (size_t)-1;
             return NULL;
+        }
         bytes = result;
     }
     return result;

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

From python-checkins at python.org  Tue Nov 13 00:06:19 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue, 13 Nov 2012 00:06:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316416=3A_Fix_Misc?=
 =?utf-8?q?/NEWS_entry=2C_mention_Mac_OS_X?=
Message-ID: <3Y0ndl2lSGzQQD@mail.python.org>

http://hg.python.org/cpython/rev/1b97cc71a05e
changeset:   80416:1b97cc71a05e
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Nov 12 23:52:04 2012 +0100
summary:
  Issue #16416: Fix Misc/NEWS entry, mention Mac OS X

files:
  Misc/NEWS |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,11 +10,11 @@
 Core and Builtins
 -----------------
 
-- Issue #16416: OS data are now always encoded/decoded to/from
-  UTF-8/surrogateescape, instead of the locale encoding (which may be ASCII if
-  no locale environment variable is set), to avoid inconsistencies with
-  os.fsencode() and os.fsdecode() functions which are already using
-  UTF-8/surrogateescape.
+- Issue #16416: On Mac OS X, operating system data are now always
+  encoded/decoded to/from UTF-8/surrogateescape, instead of the locale encoding
+  (which may be ASCII if no locale environment variable is set), to avoid
+  inconsistencies with os.fsencode() and os.fsdecode() functions which are
+  already using UTF-8/surrogateescape.
 
 - Issue #16453: Fix equality testing of dead weakref objects.
 

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

From solipsis at pitrou.net  Tue Nov 13 05:58:43 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 13 Nov 2012 05:58:43 +0100
Subject: [Python-checkins] Daily reference leaks (1b97cc71a05e): sum=2
Message-ID: <E1TY8aB-0007vn-0G@ap.vmr.nerim.net>

results for 1b97cc71a05e on branch "default"
--------------------------------------------

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


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

From python-checkins at python.org  Tue Nov 13 09:31:27 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue, 13 Nov 2012 09:31:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315478=3A_os=2Elch?=
 =?utf-8?q?flags=28=29_is_not_always_available_when_os=2Echflags=28=29_is?=
Message-ID: <3Y129q5fHnzR5l@mail.python.org>

http://hg.python.org/cpython/rev/ee7b713fec71
changeset:   80417:ee7b713fec71
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Nov 13 09:31:51 2012 +0100
summary:
  Issue #15478: os.lchflags() is not always available when os.chflags() is available

files:
  Lib/test/test_os.py |  7 +++----
  1 files changed, 3 insertions(+), 4 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
@@ -2112,10 +2112,9 @@
         if hasattr(os, "truncate"):
             funcs.append((self.filenames, os.truncate, 0))
         if hasattr(os, "chflags"):
-            funcs.extend((
-                (self.filenames, os.chflags, 0),
-                (self.filenames, os.lchflags, 0),
-            ))
+            funcs.append((self.filenames, os.chflags, 0))
+        if hasattr(os, "lchflags"):
+            funcs.append((self.filenames, os.lchflags, 0))
         if hasattr(os, "chroot"):
             funcs.append((self.filenames, os.chroot,))
         if hasattr(os, "link"):

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

From python-checkins at python.org  Tue Nov 13 17:31:48 2012
From: python-checkins at python.org (daniel.holth)
Date: Tue, 13 Nov 2012 17:31:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_PEP_427=3A_remove_signing_alg?=
	=?utf-8?q?orithms?=
Message-ID: <3Y1Dr43qz9zRNf@mail.python.org>

http://hg.python.org/peps/rev/e238af91e1bc
changeset:   4586:e238af91e1bc
user:        Daniel Holth <dholth at fastmail.fm>
date:        Tue Nov 13 11:31:37 2012 -0500
summary:
  PEP 427: remove signing algorithms

files:
  pep-0427.txt |  89 ++++++++-------------------------------
  1 files changed, 20 insertions(+), 69 deletions(-)


diff --git a/pep-0427.txt b/pep-0427.txt
--- a/pep-0427.txt
+++ b/pep-0427.txt
@@ -243,57 +243,24 @@
     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 file(s) RECORD.jws and RECORD.p7s are not mentioned in
+RECORD at all since they can only be added after RECORD is generated.
+Every other file in the archive must have a correct hash in RECORD,
+or the installation will fail.
 
-The signature format is derived from the JSON Web Signatures (JWS)
-specification.  One or more JSON Web Signature JSON Serialization (JWS-JS)
-signatures may be stored in a file RECORD.jws adjacent to RECORD.
-
-A signature-aware installer could 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 can know they are getting packages from the
-same 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.
-
-
-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.  In JSON Web Key
-/ JSON Private Key the Ed25519 verifying (public) key is called vk and
-the signing (private) key is called sk.
-
-Example header::
-
-    {
-      "alg": "Ed25519",
-      "jwk": {
-        "alg": "Ed25519",
-        "vk": "tmAYCrSfj8gtJ10v3VkvW7jOndKmQIYE12hgnFu3cvk"
-      }
-    }
-
-Example payload, always the SHA-256 hash of RECORD::
+If JSON web signatures are used, one or more JSON Web Signature JSON
+Serialization (JWS-JS) signatures may be stored in a file RECORD.jws
+adjacent to RECORD.  JWS is used to sign RECORD by including the SHA-256
+hash of RECORD as the JWS payload::
 
     { "hash": "sha256=ADD-r2urObZHcxBW3Cr-vDCu5RJwT4CaRTHiFmbcIYY" }
 
-A future version of wheel may include timestamps in the payload or in
-the signature.
+If RECORD.p7s is used, it must contain a PKCS#7 format signature of
+RECORD.
+
+A wheel installer may assume that the signature has already been checked
+against RECORD, and only must verify the hashes in RECORD against the
+extracted file contents.
 
 See
 
@@ -301,7 +268,6 @@
 - http://self-issued.info/docs/draft-jones-jose-jws-json-serialization.html
 - http://self-issued.info/docs/draft-ietf-jose-json-web-key.html
 - http://self-issued.info/docs/draft-jones-jose-json-private-key.html
-- http://ed25519.cr.yp.to/
 
 
 Comparison to .egg
@@ -342,27 +308,12 @@
     resource)`` even though *those* files will usually not be distributed
     in *wheel's* ``.data`` directory.
 
-Why are you using Ed25519 and JWS instead of PGP, S/MIME, or ECDSA?
-    Wheel's signing scheme is designed to protect against cryptography
-    that is not used.  The system yields a tiny, performant pure-Python
-    implementation that can just be included with the reference installer.
-    The 32-byte public keys are convienent to share directly in the
-    same way you would share a SHA-256 digest.  Since the signatures
-    are inside the archive itself, they are more likely to be present
-    at install time compared to detached signatures.
-
-    Wheel's signing system is designed to be used more like an md5 sum
-    or a secure hash used to verify the integrity of an archive than
-    something like PGP or X.509 signatures.  A secure hash can verify
-    the integrity of a single archive, but a wheel signing key verifies
-    the signer of all packages signed with that key.  Once you know to
-    expect a particular signing key, a signature-verifying installer
-    protects you from installing anything but intact packages from the
-    expected signers.  It makes no difference whether the wrong packages
-    come from choosing the wrong package index, disk corruption, or an
-    actual attack; if a package is not signed with the expected key,
-    with its file contents matching their hashes in RECORD, then it will
-    not be installed.
+Why does wheel include attached signatures?
+    Attached signatures are more convenient than detached signatures
+    because they travel with the archive.  Since only the individual files
+    are signed, the archive can be recompressed without invalidating
+    the signature, or individual files can be verified without having
+    to download the whole archive.
 
 Appendix
 ========

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

From python-checkins at python.org  Tue Nov 13 21:26:51 2012
From: python-checkins at python.org (philip.jenvey)
Date: Tue, 13 Nov 2012 21:26:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogYWRkIGdjX2NvbGxl?=
	=?utf-8?q?cts_to_weakref_tests?=
Message-ID: <3Y1L3H4Qv8zRNf@mail.python.org>

http://hg.python.org/cpython/rev/a580cf4ab940
changeset:   80418:a580cf4ab940
branch:      3.2
parent:      80397:8a28c974f903
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Tue Nov 13 12:26:31 2012 -0800
summary:
  add gc_collects to weakref tests

files:
  Lib/test/test_exceptions.py |  3 +++
  1 files changed, 3 insertions(+), 0 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
@@ -493,6 +493,7 @@
             e.__context__ = None
             obj = None
             obj = wr()
+            gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -509,6 +510,7 @@
             except MyException:
                 pass
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -523,6 +525,7 @@
         with Context():
             inner_raising_func()
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 

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

From python-checkins at python.org  Tue Nov 13 21:26:52 2012
From: python-checkins at python.org (philip.jenvey)
Date: Tue, 13 Nov 2012 21:26:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
	=?utf-8?q?_merge_3=2E2?=
Message-ID: <3Y1L3J6bzhzRLW@mail.python.org>

http://hg.python.org/cpython/rev/21cc413eb23c
changeset:   80419:21cc413eb23c
branch:      3.3
parent:      80412:59ea4a473e2a
parent:      80418:a580cf4ab940
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Tue Nov 13 12:27:56 2012 -0800
summary:
  merge 3.2

files:
  Lib/test/test_exceptions.py |  3 +++
  1 files changed, 3 insertions(+), 0 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
@@ -551,6 +551,7 @@
             e.__context__ = None
             obj = None
             obj = wr()
+            gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -567,6 +568,7 @@
             except MyException:
                 pass
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -581,6 +583,7 @@
         with Context():
             inner_raising_func()
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 

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

From python-checkins at python.org  Tue Nov 13 21:26:54 2012
From: python-checkins at python.org (philip.jenvey)
Date: Tue, 13 Nov 2012 21:26:54 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4z?=
Message-ID: <3Y1L3L1nckzRPX@mail.python.org>

http://hg.python.org/cpython/rev/5d1646c8708f
changeset:   80420:5d1646c8708f
parent:      80417:ee7b713fec71
parent:      80419:21cc413eb23c
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Tue Nov 13 12:28:39 2012 -0800
summary:
  merge 3.3

files:
  Lib/test/test_exceptions.py |  3 +++
  1 files changed, 3 insertions(+), 0 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
@@ -551,6 +551,7 @@
             e.__context__ = None
             obj = None
             obj = wr()
+            gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -567,6 +568,7 @@
             except MyException:
                 pass
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -581,6 +583,7 @@
         with Context():
             inner_raising_func()
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 

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

From python-checkins at python.org  Tue Nov 13 21:37:11 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Tue, 13 Nov 2012 21:37:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2312428=3A_Add_a_pu?=
 =?utf-8?q?re_Python_implementation_of_functools=2Epartial=28=29=2E?=
Message-ID: <3Y1LHC0Kz1zRKM@mail.python.org>

http://hg.python.org/cpython/rev/fcfaca024160
changeset:   80421:fcfaca024160
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Nov 13 21:35:40 2012 +0100
summary:
  Issue #12428: Add a pure Python implementation of functools.partial().
Patch by Brian Thorne.

files:
  Lib/functools.py           |   28 +++-
  Lib/test/test_functools.py |  208 ++++++++++++++++--------
  Misc/ACKS                  |    1 +
  Misc/NEWS                  |    3 +
  4 files changed, 167 insertions(+), 73 deletions(-)


diff --git a/Lib/functools.py b/Lib/functools.py
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -11,7 +11,10 @@
 __all__ = ['update_wrapper', 'wraps', 'WRAPPER_ASSIGNMENTS', 'WRAPPER_UPDATES',
            'total_ordering', 'cmp_to_key', 'lru_cache', 'reduce', 'partial']
 
-from _functools import partial, reduce
+try:
+    from _functools import reduce
+except ImportError:
+    pass
 from collections import namedtuple
 try:
     from _thread import allocate_lock as Lock
@@ -137,6 +140,29 @@
 
 
 ################################################################################
+### partial() argument application
+################################################################################
+
+def partial(func, *args, **keywords):
+    """new function with partial application of the given arguments
+    and keywords.
+    """
+    def newfunc(*fargs, **fkeywords):
+        newkeywords = keywords.copy()
+        newkeywords.update(fkeywords)
+        return func(*(args + fargs), **newkeywords)
+    newfunc.func = func
+    newfunc.args = args
+    newfunc.keywords = keywords
+    return newfunc
+
+try:
+    from _functools import partial
+except ImportError:
+    pass
+
+
+################################################################################
 ### LRU Cache function decorator
 ################################################################################
 
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1,4 +1,3 @@
-import functools
 import collections
 import sys
 import unittest
@@ -7,17 +6,31 @@
 import pickle
 from random import choice
 
- at staticmethod
-def PythonPartial(func, *args, **keywords):
-    'Pure Python approximation of partial()'
-    def newfunc(*fargs, **fkeywords):
-        newkeywords = keywords.copy()
-        newkeywords.update(fkeywords)
-        return func(*(args + fargs), **newkeywords)
-    newfunc.func = func
-    newfunc.args = args
-    newfunc.keywords = keywords
-    return newfunc
+import functools
+
+original_functools = functools
+py_functools = support.import_fresh_module('functools', blocked=['_functools'])
+c_functools = support.import_fresh_module('functools', fresh=['_functools'])
+
+class BaseTest(unittest.TestCase):
+
+    """Base class required for testing C and Py implementations."""
+
+    def setUp(self):
+
+        # The module must be explicitly set so that the proper
+        # interaction between the c module and the python module
+        # can be controlled.
+        self.partial = self.module.partial
+        super(BaseTest, self).setUp()
+
+class BaseTestC(BaseTest):
+    module = c_functools
+
+class BaseTestPy(BaseTest):
+    module = py_functools
+
+PythonPartial = py_functools.partial
 
 def capture(*args, **kw):
     """capture all positional and keyword arguments"""
@@ -27,31 +40,32 @@
     """ return the signature of a partial object """
     return (part.func, part.args, part.keywords, part.__dict__)
 
-class TestPartial(unittest.TestCase):
+class TestPartial(object):
 
-    thetype = functools.partial
+    partial = functools.partial
 
     def test_basic_examples(self):
-        p = self.thetype(capture, 1, 2, a=10, b=20)
+        p = self.partial(capture, 1, 2, a=10, b=20)
+        self.assertTrue(callable(p))
         self.assertEqual(p(3, 4, b=30, c=40),
                          ((1, 2, 3, 4), dict(a=10, b=30, c=40)))
-        p = self.thetype(map, lambda x: x*10)
+        p = self.partial(map, lambda x: x*10)
         self.assertEqual(list(p([1,2,3,4])), [10, 20, 30, 40])
 
     def test_attributes(self):
-        p = self.thetype(capture, 1, 2, a=10, b=20)
+        p = self.partial(capture, 1, 2, a=10, b=20)
         # attributes should be readable
         self.assertEqual(p.func, capture)
         self.assertEqual(p.args, (1, 2))
         self.assertEqual(p.keywords, dict(a=10, b=20))
         # attributes should not be writable
-        if not isinstance(self.thetype, type):
+        if not isinstance(self.partial, type):
             return
         self.assertRaises(AttributeError, setattr, p, 'func', map)
         self.assertRaises(AttributeError, setattr, p, 'args', (1, 2))
         self.assertRaises(AttributeError, setattr, p, 'keywords', dict(a=1, b=2))
 
-        p = self.thetype(hex)
+        p = self.partial(hex)
         try:
             del p.__dict__
         except TypeError:
@@ -60,9 +74,9 @@
             self.fail('partial object allowed __dict__ to be deleted')
 
     def test_argument_checking(self):
-        self.assertRaises(TypeError, self.thetype)     # need at least a func arg
+        self.assertRaises(TypeError, self.partial)     # need at least a func arg
         try:
-            self.thetype(2)()
+            self.partial(2)()
         except TypeError:
             pass
         else:
@@ -73,7 +87,7 @@
         def func(a=10, b=20):
             return a
         d = {'a':3}
-        p = self.thetype(func, a=5)
+        p = self.partial(func, a=5)
         self.assertEqual(p(**d), 3)
         self.assertEqual(d, {'a':3})
         p(b=7)
@@ -82,20 +96,20 @@
     def test_arg_combinations(self):
         # exercise special code paths for zero args in either partial
         # object or the caller
-        p = self.thetype(capture)
+        p = self.partial(capture)
         self.assertEqual(p(), ((), {}))
         self.assertEqual(p(1,2), ((1,2), {}))
-        p = self.thetype(capture, 1, 2)
+        p = self.partial(capture, 1, 2)
         self.assertEqual(p(), ((1,2), {}))
         self.assertEqual(p(3,4), ((1,2,3,4), {}))
 
     def test_kw_combinations(self):
         # exercise special code paths for no keyword args in
         # either the partial object or the caller
-        p = self.thetype(capture)
+        p = self.partial(capture)
         self.assertEqual(p(), ((), {}))
         self.assertEqual(p(a=1), ((), {'a':1}))
-        p = self.thetype(capture, a=1)
+        p = self.partial(capture, a=1)
         self.assertEqual(p(), ((), {'a':1}))
         self.assertEqual(p(b=2), ((), {'a':1, 'b':2}))
         # keyword args in the call override those in the partial object
@@ -104,7 +118,7 @@
     def test_positional(self):
         # make sure positional arguments are captured correctly
         for args in [(), (0,), (0,1), (0,1,2), (0,1,2,3)]:
-            p = self.thetype(capture, *args)
+            p = self.partial(capture, *args)
             expected = args + ('x',)
             got, empty = p('x')
             self.assertTrue(expected == got and empty == {})
@@ -112,14 +126,14 @@
     def test_keyword(self):
         # make sure keyword arguments are captured correctly
         for a in ['a', 0, None, 3.5]:
-            p = self.thetype(capture, a=a)
+            p = self.partial(capture, a=a)
             expected = {'a':a,'x':None}
             empty, got = p(x=None)
             self.assertTrue(expected == got and empty == ())
 
     def test_no_side_effects(self):
         # make sure there are no side effects that affect subsequent calls
-        p = self.thetype(capture, 0, a=1)
+        p = self.partial(capture, 0, a=1)
         args1, kw1 = p(1, b=2)
         self.assertTrue(args1 == (0,1) and kw1 == {'a':1,'b':2})
         args2, kw2 = p()
@@ -128,13 +142,13 @@
     def test_error_propagation(self):
         def f(x, y):
             x / y
-        self.assertRaises(ZeroDivisionError, self.thetype(f, 1, 0))
-        self.assertRaises(ZeroDivisionError, self.thetype(f, 1), 0)
-        self.assertRaises(ZeroDivisionError, self.thetype(f), 1, 0)
-        self.assertRaises(ZeroDivisionError, self.thetype(f, y=0), 1)
+        self.assertRaises(ZeroDivisionError, self.partial(f, 1, 0))
+        self.assertRaises(ZeroDivisionError, self.partial(f, 1), 0)
+        self.assertRaises(ZeroDivisionError, self.partial(f), 1, 0)
+        self.assertRaises(ZeroDivisionError, self.partial(f, y=0), 1)
 
     def test_weakref(self):
-        f = self.thetype(int, base=16)
+        f = self.partial(int, base=16)
         p = proxy(f)
         self.assertEqual(f.func, p.func)
         f = None
@@ -142,9 +156,9 @@
 
     def test_with_bound_and_unbound_methods(self):
         data = list(map(str, range(10)))
-        join = self.thetype(str.join, '')
+        join = self.partial(str.join, '')
         self.assertEqual(join(data), '0123456789')
-        join = self.thetype(''.join)
+        join = self.partial(''.join)
         self.assertEqual(join(data), '0123456789')
 
     def test_repr(self):
@@ -152,49 +166,57 @@
         args_repr = ', '.join(repr(a) for a in args)
         kwargs = {'a': object(), 'b': object()}
         kwargs_repr = ', '.join("%s=%r" % (k, v) for k, v in kwargs.items())
-        if self.thetype is functools.partial:
+        if self.partial is functools.partial:
             name = 'functools.partial'
         else:
-            name = self.thetype.__name__
+            name = self.partial.__name__
 
-        f = self.thetype(capture)
+        f = self.partial(capture)
         self.assertEqual('{}({!r})'.format(name, capture),
                          repr(f))
 
-        f = self.thetype(capture, *args)
+        f = self.partial(capture, *args)
         self.assertEqual('{}({!r}, {})'.format(name, capture, args_repr),
                          repr(f))
 
-        f = self.thetype(capture, **kwargs)
+        f = self.partial(capture, **kwargs)
         self.assertEqual('{}({!r}, {})'.format(name, capture, kwargs_repr),
                          repr(f))
 
-        f = self.thetype(capture, *args, **kwargs)
+        f = self.partial(capture, *args, **kwargs)
         self.assertEqual('{}({!r}, {}, {})'.format(name, capture, args_repr, kwargs_repr),
                          repr(f))
 
     def test_pickle(self):
-        f = self.thetype(signature, 'asdf', bar=True)
+        f = self.partial(signature, 'asdf', bar=True)
         f.add_something_to__dict__ = True
         f_copy = pickle.loads(pickle.dumps(f))
         self.assertEqual(signature(f), signature(f_copy))
 
-class PartialSubclass(functools.partial):
+class TestPartialC(BaseTestC, TestPartial):
     pass
 
-class TestPartialSubclass(TestPartial):
+class TestPartialPy(BaseTestPy, TestPartial):
 
-    thetype = PartialSubclass
+    def test_pickle(self):
+        raise unittest.SkipTest("Python implementation of partial isn't picklable")
+    
+    def test_repr(self):
+        raise unittest.SkipTest("Python implementation of partial uses own repr")
 
-class TestPythonPartial(TestPartial):
+class TestPartialCSubclass(BaseTestC, TestPartial):
 
-    thetype = PythonPartial
+    class PartialSubclass(c_functools.partial):
+        pass
 
-    # the python version hasn't a nice repr
-    def test_repr(self): pass
+    partial = staticmethod(PartialSubclass)
 
-    # the python version isn't picklable
-    def test_pickle(self): pass
+class TestPartialPySubclass(TestPartialPy):
+
+    class PartialSubclass(c_functools.partial):
+        pass
+
+    partial = staticmethod(PartialSubclass)
 
 class TestUpdateWrapper(unittest.TestCase):
 
@@ -320,7 +342,7 @@
         self.assertEqual(wrapper.__qualname__, f.__qualname__)
         self.assertEqual(wrapper.attr, 'This is also a test')
 
-    @unittest.skipIf(not sys.flags.optimize <= 1,
+    @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_default_update_doc(self):
         wrapper, _ = self._default_update()
@@ -441,24 +463,28 @@
         d = {"one": 1, "two": 2, "three": 3}
         self.assertEqual(self.func(add, d), "".join(d.keys()))
 
-class TestCmpToKey(unittest.TestCase):
+class TestCmpToKey(object):
 
     def test_cmp_to_key(self):
         def cmp1(x, y):
             return (x > y) - (x < y)
-        key = functools.cmp_to_key(cmp1)
+        key = self.cmp_to_key(cmp1)
         self.assertEqual(key(3), key(3))
         self.assertGreater(key(3), key(1))
+        self.assertGreaterEqual(key(3), key(3))
+
         def cmp2(x, y):
             return int(x) - int(y)
-        key = functools.cmp_to_key(cmp2)
+        key = self.cmp_to_key(cmp2)
         self.assertEqual(key(4.0), key('4'))
         self.assertLess(key(2), key('35'))
+        self.assertLessEqual(key(2), key('35'))
+        self.assertNotEqual(key(2), key('35'))
 
     def test_cmp_to_key_arguments(self):
         def cmp1(x, y):
             return (x > y) - (x < y)
-        key = functools.cmp_to_key(mycmp=cmp1)
+        key = self.cmp_to_key(mycmp=cmp1)
         self.assertEqual(key(obj=3), key(obj=3))
         self.assertGreater(key(obj=3), key(obj=1))
         with self.assertRaises((TypeError, AttributeError)):
@@ -466,10 +492,10 @@
         with self.assertRaises((TypeError, AttributeError)):
             1 < key(3)    # lhs is not a K object
         with self.assertRaises(TypeError):
-            key = functools.cmp_to_key()             # too few args
+            key = self.cmp_to_key()             # too few args
         with self.assertRaises(TypeError):
-            key = functools.cmp_to_key(cmp1, None)   # too many args
-        key = functools.cmp_to_key(cmp1)
+            key = self.module.cmp_to_key(cmp1, None)   # too many args
+        key = self.cmp_to_key(cmp1)
         with self.assertRaises(TypeError):
             key()                                    # too few args
         with self.assertRaises(TypeError):
@@ -478,7 +504,7 @@
     def test_bad_cmp(self):
         def cmp1(x, y):
             raise ZeroDivisionError
-        key = functools.cmp_to_key(cmp1)
+        key = self.cmp_to_key(cmp1)
         with self.assertRaises(ZeroDivisionError):
             key(3) > key(1)
 
@@ -493,13 +519,13 @@
     def test_obj_field(self):
         def cmp1(x, y):
             return (x > y) - (x < y)
-        key = functools.cmp_to_key(mycmp=cmp1)
+        key = self.cmp_to_key(mycmp=cmp1)
         self.assertEqual(key(50).obj, 50)
 
     def test_sort_int(self):
         def mycmp(x, y):
             return y - x
-        self.assertEqual(sorted(range(5), key=functools.cmp_to_key(mycmp)),
+        self.assertEqual(sorted(range(5), key=self.cmp_to_key(mycmp)),
                          [4, 3, 2, 1, 0])
 
     def test_sort_int_str(self):
@@ -507,18 +533,24 @@
             x, y = int(x), int(y)
             return (x > y) - (x < y)
         values = [5, '3', 7, 2, '0', '1', 4, '10', 1]
-        values = sorted(values, key=functools.cmp_to_key(mycmp))
+        values = sorted(values, key=self.cmp_to_key(mycmp))
         self.assertEqual([int(value) for value in values],
                          [0, 1, 1, 2, 3, 4, 5, 7, 10])
 
     def test_hash(self):
         def mycmp(x, y):
             return y - x
-        key = functools.cmp_to_key(mycmp)
+        key = self.cmp_to_key(mycmp)
         k = key(10)
         self.assertRaises(TypeError, hash, k)
         self.assertNotIsInstance(k, collections.Hashable)
 
+class TestCmpToKeyC(BaseTestC, TestCmpToKey):
+    cmp_to_key = c_functools.cmp_to_key
+
+class TestCmpToKeyPy(BaseTestPy, TestCmpToKey):
+    cmp_to_key = staticmethod(py_functools.cmp_to_key)
+
 class TestTotalOrdering(unittest.TestCase):
 
     def test_total_ordering_lt(self):
@@ -623,7 +655,7 @@
 
     def test_lru(self):
         def orig(x, y):
-            return 3*x+y
+            return 3 * x + y
         f = functools.lru_cache(maxsize=20)(orig)
         hits, misses, maxsize, currsize = f.cache_info()
         self.assertEqual(maxsize, 20)
@@ -728,7 +760,7 @@
         # Verify that user_function exceptions get passed through without
         # creating a hard-to-read chained exception.
         # http://bugs.python.org/issue13177
-        for maxsize in (None, 100):
+        for maxsize in (None, 128):
             @functools.lru_cache(maxsize)
             def func(i):
                 return 'abc'[i]
@@ -741,7 +773,7 @@
                 func(15)
 
     def test_lru_with_types(self):
-        for maxsize in (None, 100):
+        for maxsize in (None, 128):
             @functools.lru_cache(maxsize=maxsize, typed=True)
             def square(x):
                 return x * x
@@ -756,14 +788,46 @@
             self.assertEqual(square.cache_info().hits, 4)
             self.assertEqual(square.cache_info().misses, 4)
 
+    def test_lru_with_keyword_args(self):
+        @functools.lru_cache()
+        def fib(n):
+            if n < 2:
+                return n
+            return fib(n=n-1) + fib(n=n-2)
+        self.assertEqual(
+            [fib(n=number) for number in range(16)],
+            [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610]
+        )
+        self.assertEqual(fib.cache_info(),
+            functools._CacheInfo(hits=28, misses=16, maxsize=128, currsize=16))
+        fib.cache_clear()
+        self.assertEqual(fib.cache_info(),
+            functools._CacheInfo(hits=0, misses=0, maxsize=128, currsize=0))
+
+    def test_lru_with_keyword_args_maxsize_none(self):
+        @functools.lru_cache(maxsize=None)
+        def fib(n):
+            if n < 2:
+                return n
+            return fib(n=n-1) + fib(n=n-2)
+        self.assertEqual([fib(n=number) for number in range(16)],
+            [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610])
+        self.assertEqual(fib.cache_info(),
+            functools._CacheInfo(hits=28, misses=16, maxsize=None, currsize=16))
+        fib.cache_clear()
+        self.assertEqual(fib.cache_info(),
+            functools._CacheInfo(hits=0, misses=0, maxsize=None, currsize=0))
+
 def test_main(verbose=None):
     test_classes = (
-        TestPartial,
-        TestPartialSubclass,
-        TestPythonPartial,
+        TestPartialC,
+        TestPartialPy,
+        TestPartialCSubclass,
+        TestPartialPySubclass,
         TestUpdateWrapper,
         TestTotalOrdering,
-        TestCmpToKey,
+        TestCmpToKeyC,
+        TestCmpToKeyPy,
         TestWraps,
         TestReduce,
         TestLRU,
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1166,6 +1166,7 @@
 Nicolas M. Thi?ry
 James Thomas
 Robin Thomas
+Brian Thorne
 Stephen Thorne
 Jeremy Thurgood
 Eric Tiedemann
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -124,6 +124,9 @@
 Library
 -------
 
+- Issue #12428: Add a pure Python implementation of functools.partial().
+  Patch by Brian Thorne.
+
 - Issue #16140: The subprocess module no longer double closes its child
   subprocess.PIPE parent file descriptors on child error prior to exec().
 

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

From python-checkins at python.org  Tue Nov 13 21:37:12 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Tue, 13 Nov 2012 21:37:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_whitespace=2E?=
Message-ID: <3Y1LHD2ZMSzRLF@mail.python.org>

http://hg.python.org/cpython/rev/770329b88214
changeset:   80422:770329b88214
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Nov 13 21:36:21 2012 +0100
summary:
  Fix whitespace.

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


diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -200,7 +200,7 @@
 
     def test_pickle(self):
         raise unittest.SkipTest("Python implementation of partial isn't picklable")
-    
+
     def test_repr(self):
         raise unittest.SkipTest("Python implementation of partial uses own repr")
 

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

From solipsis at pitrou.net  Wed Nov 14 05:57:22 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 14 Nov 2012 05:57:22 +0100
Subject: [Python-checkins] Daily reference leaks (770329b88214): sum=0
Message-ID: <E1TYV2Q-00080j-Qt@ap.vmr.nerim.net>

results for 770329b88214 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Wed Nov 14 11:15:19 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 14 Nov 2012 11:15:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogTGluayB0byAiWFJh?=
 =?utf-8?q?nge_Type=22_section_in_xrange=28=29_built-in_function_documenta?=
 =?utf-8?q?tion=2E?=
Message-ID: <3Y1hRC1BCZzRSd@mail.python.org>

http://hg.python.org/cpython/rev/b25dcfe2b244
changeset:   80423:b25dcfe2b244
branch:      2.7
parent:      80408:bb21c800cf49
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 14 02:13:28 2012 -0800
summary:
  Link to "XRange Type" section in xrange() built-in function documentation.

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1523,14 +1523,16 @@
 .. function:: xrange(stop)
               xrange(start, stop[, step])
 
-   This function is very similar to :func:`range`, but returns an "xrange object"
+   This function is very similar to :func:`range`, but returns an :ref:`xrange
+   object <typesseq-xrange>`
    instead of a list.  This is an opaque sequence type which yields the same values
    as the corresponding list, without actually storing them all simultaneously.
    The advantage of :func:`xrange` over :func:`range` is minimal (since
    :func:`xrange` still has to create the values when asked for them) except when a
    very large range is used on a memory-starved machine or when all of the range's
    elements are never used (such as when the loop is usually terminated with
-   :keyword:`break`).
+   :keyword:`break`).  For more information on xrange objects, see
+   :ref:`typesseq-xrange` and :ref:`typesseq`.
 
    .. impl-detail::
 

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

From python-checkins at python.org  Wed Nov 14 12:19:59 2012
From: python-checkins at python.org (vinay.sajip)
Date: Wed, 14 Nov 2012 12:19:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2Mzc4?=
 =?utf-8?q?=3A_Updated_docstrings_to_reflect_the_defaults_present_in_the_c?=
 =?utf-8?q?ode=2E?=
Message-ID: <3Y1jsq2wj0zMyJ@mail.python.org>

http://hg.python.org/cpython/rev/afb476dc202f
changeset:   80424:afb476dc202f
branch:      3.3
parent:      80419:21cc413eb23c
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Wed Nov 14 11:18:35 2012 +0000
summary:
  Issue #16378: Updated docstrings to reflect the defaults present in the code.

files:
  Lib/venv/__init__.py |  11 +++++++----
  1 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -54,9 +54,11 @@
     behaviour when called upon to create a virtual environment.
 
     By default, the builder makes the system (global) site-packages dir
-    available to the created environment.
+    *un*available to the created environment.
 
-    By default, the creation process uses symlinks wherever possible.
+    If invoked using the Python -m option, the default is to use copying
+    on Windows platforms but symlinks elsewhere. If instantiated some
+    other way, the default is to *not* use symlinks.
 
     :param system_site_packages: If True, the system (global) site-packages
                                  dir is available to created environments.
@@ -322,8 +324,9 @@
     """
     Create a virtual environment in a directory.
 
-    By default, makes the system (global) site-packages dir available to
-    the created environment.
+    By default, makes the system (global) site-packages dir *un*available to
+    the created environment, and uses copying rather than symlinking for files
+    obtained from the source Python installation.
 
     :param env_dir: The target directory to create an environment in.
     :param system_site_packages: If True, the system (global) site-packages

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

From python-checkins at python.org  Wed Nov 14 12:20:00 2012
From: python-checkins at python.org (vinay.sajip)
Date: Wed, 14 Nov 2012 12:20:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Closes_=2316378=3A_Merged_docstring_changes_from_3=2E3?=
 =?utf-8?q?=2E?=
Message-ID: <3Y1jsr5XmrzRRy@mail.python.org>

http://hg.python.org/cpython/rev/6f0e49ed0589
changeset:   80425:6f0e49ed0589
parent:      80422:770329b88214
parent:      80424:afb476dc202f
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Wed Nov 14 11:19:42 2012 +0000
summary:
  Closes #16378: Merged docstring changes from 3.3.

files:
  Lib/venv/__init__.py |  11 +++++++----
  1 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -54,9 +54,11 @@
     behaviour when called upon to create a virtual environment.
 
     By default, the builder makes the system (global) site-packages dir
-    available to the created environment.
+    *un*available to the created environment.
 
-    By default, the creation process uses symlinks wherever possible.
+    If invoked using the Python -m option, the default is to use copying
+    on Windows platforms but symlinks elsewhere. If instantiated some
+    other way, the default is to *not* use symlinks.
 
     :param system_site_packages: If True, the system (global) site-packages
                                  dir is available to created environments.
@@ -330,8 +332,9 @@
     """
     Create a virtual environment in a directory.
 
-    By default, makes the system (global) site-packages dir available to
-    the created environment.
+    By default, makes the system (global) site-packages dir *un*available to
+    the created environment, and uses copying rather than symlinking for files
+    obtained from the source Python installation.
 
     :param env_dir: The target directory to create an environment in.
     :param system_site_packages: If True, the system (global) site-packages

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

From python-checkins at python.org  Wed Nov 14 18:08:50 2012
From: python-checkins at python.org (mark.dickinson)
Date: Wed, 14 Nov 2012 18:08:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbjogSXNzdWUgIzE2MjkwOiBfX2Nv?=
 =?utf-8?q?mplex=5F=5F_must_now_always_return_an_instance_of_complex=2E?=
Message-ID: <3Y1scL0WQwzRWF@mail.python.org>

http://hg.python.org/cpython/rev/399e59ad0a70
changeset:   80426:399e59ad0a70
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Wed Nov 14 17:08:31 2012 +0000
summary:
  Issue #16290: __complex__ must now always return an instance of complex.

files:
  Lib/test/test_complex.py |   2 ++
  Misc/NEWS                |   3 +++
  Objects/complexobject.c  |  12 ++++++------
  3 files changed, 11 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -221,6 +221,8 @@
         self.assertRaises(TypeError, complex, OS(None))
         self.assertRaises(TypeError, complex, NS(None))
         self.assertRaises(TypeError, complex, {})
+        self.assertRaises(TypeError, complex, NS(1.5))
+        self.assertRaises(TypeError, complex, NS(1))
 
         self.assertAlmostEqual(complex("1+10j"), 1+10j)
         self.assertAlmostEqual(complex(10), 10+0j)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16290: A float return value from the __complex__ special method is no
+  longer accepted in the complex() constructor.
+
 - Issue #16416: On Mac OS X, operating system data are now always
   encoded/decoded to/from UTF-8/surrogateescape, instead of the locale encoding
   (which may be ASCII if no locale environment variable is set), to avoid
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -271,6 +271,12 @@
     if (f) {
         PyObject *res = PyObject_CallFunctionObjArgs(f, NULL);
         Py_DECREF(f);
+        if (res != NULL && !PyComplex_Check(res)) {
+            PyErr_SetString(PyExc_TypeError,
+                "__complex__ should return a complex object");
+            Py_DECREF(res);
+            return NULL;
+        }
         return res;
     }
     return NULL;
@@ -296,12 +302,6 @@
     newop = try_complex_special_method(op);
 
     if (newop) {
-        if (!PyComplex_Check(newop)) {
-            PyErr_SetString(PyExc_TypeError,
-                "__complex__ should return a complex object");
-            Py_DECREF(newop);
-            return cv;
-        }
         cv = ((PyComplexObject *)newop)->cval;
         Py_DECREF(newop);
         return cv;

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

From python-checkins at python.org  Wed Nov 14 19:31:03 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 19:31:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Update_instructions_on_us?=
 =?utf-8?q?ing_coverage=2Epy_to_create_coverage_results_to?=
Message-ID: <3Y1vRC4fzGzMvQ@mail.python.org>

http://hg.python.org/devguide/rev/6047ffc9cf03
changeset:   563:6047ffc9cf03
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 12:30:24 2012 -0500
summary:
  Update instructions on using coverage.py to create coverage results to
promote using a clone instead of an installed copy.

files:
  coverage.rst |  47 ++++++++++++++++++++++-----------------
  1 files changed, 26 insertions(+), 21 deletions(-)


diff --git a/coverage.rst b/coverage.rst
--- a/coverage.rst
+++ b/coverage.rst
@@ -85,56 +85,61 @@
 Because the in-development version of Python is bleeding-edge, it is possible
 that the latest release version of coverage.py will not work. In that case you
 should try using the in-development of coverage.py to see if it has been
-updated as needed. To do this you should check out the development version of
-coverage.py into your checkout of Python and make a symlink (or simply copy if
-you prefer) of its ``coverage`` subdirectory::
+updated as needed. To do this you should clone/check out the development version
+of coverage.py::
 
     hg clone https://bitbucket.org/ned/coveragepy
-    ln -s coveragepy/coverage
 
-Another option is to
-download the source distribution of coverage.py and copy the ``coverage``
-directory into your Python checkout. The other option is to use your checkout
-copy of Python to install coverage.py (but use the ``--user`` flag to
-Distutils!).
+Another option is to use an installed copy of coverage.py if you already an
+installed copy. But if you do not already have it installed then it is preferred
+you use a clone of coverage.py for gathering coverage results.
 
-Regardless of how you installed coverage.py, the following should work::
+If you are using a clone of coverage.py, the following should work (substitute
+``COVERAGEDIR`` with the directory where your clone exists, e.g.
+``../coveragepy``)::
+
+    ./python COVERAGEDIR
+
+Coverage.py will print out a little bit of helper text verifying that
+everything is working. If you are using an installed copy, you can do the
+following instead::
 
     ./python -m coverage
 
-Coverage.py will print out a little bit of helper text verifying that
-everything is working.
+The rest of the examples on how to use coverage.py will assume you are using a
+cloned copy, but you can substitute the above and all instructions should still
+be valid.
 
 To run the test suite under coverage.py, do the following::
 
-    ./python -m coverage run --pylib Lib/test/regrtest.py
+    ./python COVERAGEDIR run --pylib Lib/test/regrtest.py
 
 To run only a single test, specify the module/package being tested
 in the ``--source`` flag (so as to prune the coverage reporting to only the
 module/package you are interested in) and then append the name of the test you
 wish to run to the command::
 
-    ./python -m coverage run --pylib --source=abc Lib/test/regrtest.py test_abc
+    ./python COVERAGEDIR run --pylib --source=abc Lib/test/regrtest.py test_abc
 
 To see the results of the coverage run, you can view a text-based report with::
 
-    ./python -m coverage report
+    ./python COVERAGEDIR report
 
 You can use the ``--show-missing`` flag to get a list of lines that were not
 executed::
 
-    ./python -m coverage report --show-missing
+    ./python COVERAGEDIR report --show-missing
 
 But one of the strengths of coverage.py is its HTML-based reports which let
 you visually see what lines of code were not tested::
 
-    ./python -m coverage html -i --omit="*/test/*,*/tests/*,Tools/*"
+    ./python COVERAGDIR html -i --include="Lib/*" --omit="*/test/*,*/tests/*,Tools/*"
 
 This will generate an HTML report in a directory named ``htmlcov`` which
 ignores any errors that may arise and ignores modules for which test coverage is
-unimportant (e.g. tests). You can then open the ``htmlcov/index.html`` file in a
-web browser to view the coverage results along with pages that visibly show what
-lines of code were or were not executed.
+unimportant (e.g. tests, temp files, etc.). You can then open the
+``htmlcov/index.html`` file in a web browser to view the coverage results along
+with pages that visibly show what lines of code were or were not executed.
 
 
 .. _branch_coverage:
@@ -150,7 +155,7 @@
 If you decide you want to try to improve branch coverage, simply add the
 ``--branch`` flag to your coverage run::
 
-    ./python -m coverage run --pylib --branch <arguments to run test(s)>
+    ./python COVERAGEDIR run --pylib --branch <arguments to run test(s)>
 
 This will lead to the report stating not only what lines were not covered, but
 also what branch paths were not executed.

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

From python-checkins at python.org  Wed Nov 14 19:31:05 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 19:31:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Give_instructions_on_how_?=
 =?utf-8?q?to_get_the_most_complete_code_coverage?=
Message-ID: <3Y1vRF01vYzMvQ@mail.python.org>

http://hg.python.org/devguide/rev/dac396a730e4
changeset:   564:dac396a730e4
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 13:30:52 2012 -0500
summary:
  Give instructions on how to get the most complete code coverage
possible with a proper warning that it uses a horrible hack that no
one should use.

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


diff --git a/coverage.rst b/coverage.rst
--- a/coverage.rst
+++ b/coverage.rst
@@ -161,6 +161,35 @@
 also what branch paths were not executed.
 
 
+Coverage Results For Modules Imported Early On
+''''''''''''''''''''''''''''''''''''''''''''''
+
+For the *truly truly* daring, you can use a hack to get coverage.py to include
+coverage for modules that are imported early on during CPython's startup (e.g.
+the encodings module). Do not worry if you can't get this to work or it doesn't
+make any sense; it's entirely optional and only important for a small number of
+modules.
+
+If you still choose to try this, the first step is to build coverage.py's C
+extension code. Assuming that coverage.py's clone is at ``COVERAGEDIR`` and
+your clone of CPython is at ``CPYTHONDIR``, you execute the following in your
+coverage.py clone::
+
+  CPPFLAGS="-I CPYTHONDIR -I CPYTHONDIR/Include" CPYTHONDIR/python setup.py build_ext --inplace
+
+This will build coverage.py's C extension code in-place, allowing the previous
+instructions on how to gather coverage to continue to work.
+
+To get coverage.py to be able to gather the most accurate coverage data on as
+many modules as possible
+**with a HORRIBLE HACK that you should NEVER use in your own code**, run the
+following from your CPython clone::
+
+  PYTHONPATH=COVERAGEDIR/coverage/fullcoverage ./python COVERAGEDIR run --pylib Lib/test/regrtest.py
+
+This will give you the most complete coverage possible for CPython's standard
+library.
+
 .. _coverage.py: http://nedbatchelder.com/code/coverage/
 
 

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

From python-checkins at python.org  Wed Nov 14 21:23:08 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 21:23:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_importlib_instead_of_c?=
 =?utf-8?b?YWxsaW5nIF9faW1wb3J0X18gZGlyZWN0bHku?=
Message-ID: <3Y1xwX4zLkzRYL@mail.python.org>

http://hg.python.org/cpython/rev/379d48b56d95
changeset:   80427:379d48b56d95
parent:      80425:6f0e49ed0589
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 13:42:51 2012 -0500
summary:
  Use importlib instead of calling __import__ directly.

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


diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1210,8 +1210,7 @@
             abstest = 'test.' + test
         with saved_test_environment(test, verbose, quiet) as environment:
             start_time = time.time()
-            the_package = __import__(abstest, globals(), locals(), [])
-            the_module = getattr(the_package, test)
+            the_module = importlib.import_module(abstest)
             # If the test has a test_main, that will run the appropriate
             # tests.  If not, use normal unittest test loading.
             test_runner = getattr(the_module, "test_main", None)

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

From python-checkins at python.org  Wed Nov 14 21:23:10 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 21:23:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Clean_up_test=5Fsundry_and?=
 =?utf-8?q?_have_it_error_out_when_a_module_has_grown?=
Message-ID: <3Y1xwZ0T5DzRYM@mail.python.org>

http://hg.python.org/cpython/rev/bfd936953fc3
changeset:   80428:bfd936953fc3
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 15:16:53 2012 -0500
summary:
  Clean up test_sundry and have it error out when a module has grown
proper tests.

files:
  Lib/test/test_sundry.py |  32 ++++++++++++----------------
  1 files changed, 14 insertions(+), 18 deletions(-)


diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -1,14 +1,22 @@
 """Do a minimal test of all the modules that aren't otherwise tested."""
-
+import importlib
+import sys
 from test import support
-import sys
 import unittest
 
 class TestUntestedModules(unittest.TestCase):
-    def test_at_least_import_untested_modules(self):
+    def test_untested_modules_can_be_imported(self):
+        untested = ('bdb', 'encodings', 'formatter', 'getpass', 'imghdr',
+                    'keyword', 'macurl2path', 'nturl2path', 'tabnanny')
         with support.check_warnings(quiet=True):
-            import bdb
-            import cgitb
+            for name in untested:
+                try:
+                    support.import_module('test.test_{}'.format(name))
+                except unittest.SkipTest:
+                    importlib.import_module(name)
+                else:
+                    self.fail('{} has tests even though test_sundry claims '
+                              'otherwise'.format(name))
 
             import distutils.bcppcompiler
             import distutils.ccompiler
@@ -38,21 +46,9 @@
             import distutils.command.sdist
             import distutils.command.upload
 
-            import encodings
-            import formatter
-            import getpass
             import html.entities
-            import imghdr
-            import keyword
-            import macurl2path
-            import mailcap
-            import nturl2path
-            import pstats
-            import py_compile
-            import sndhdr
-            import tabnanny
             try:
-                import tty     # not available on Windows
+                import tty  # Not available on Windows
             except ImportError:
                 if support.verbose:
                     print("skipping tty")

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

From python-checkins at python.org  Wed Nov 14 21:23:11 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 21:23:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Clean_up_the_messages_used?=
	=?utf-8?q?_by_some_tests=2E?=
Message-ID: <3Y1xwb2mJwzRZd@mail.python.org>

http://hg.python.org/cpython/rev/520adfab957e
changeset:   80429:520adfab957e
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 15:16:53 2012 -0500
summary:
  Clean up the messages used by some tests.

files:
  Lib/test/test_devpoll.py |   2 +-
  Lib/test/test_openpty.py |   2 +-
  Lib/test/test_poll.py    |   2 +-
  Lib/test/test_wait3.py   |  12 ++++--------
  4 files changed, 7 insertions(+), 11 deletions(-)


diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py
--- a/Lib/test/test_devpoll.py
+++ b/Lib/test/test_devpoll.py
@@ -8,7 +8,7 @@
 try:
     select.devpoll
 except AttributeError:
-    raise unittest.SkipTest("select.devpoll not defined -- skipping test_devpoll")
+    raise unittest.SkipTest("select.devpoll not defined")
 
 
 def find_ready_matching(ready, flag):
diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py
--- a/Lib/test/test_openpty.py
+++ b/Lib/test/test_openpty.py
@@ -4,7 +4,7 @@
 from test.support import run_unittest
 
 if not hasattr(os, "openpty"):
-    raise unittest.SkipTest("No openpty() available.")
+    raise unittest.SkipTest("os.openpty() not available.")
 
 
 class OpenptyTest(unittest.TestCase):
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -6,7 +6,7 @@
 try:
     select.poll
 except AttributeError:
-    raise unittest.SkipTest("select.poll not defined -- skipping test_poll")
+    raise unittest.SkipTest("select.poll not defined")
 
 
 def find_ready_matching(ready, flag):
diff --git a/Lib/test/test_wait3.py b/Lib/test/test_wait3.py
--- a/Lib/test/test_wait3.py
+++ b/Lib/test/test_wait3.py
@@ -7,15 +7,11 @@
 from test.fork_wait import ForkWait
 from test.support import run_unittest, reap_children
 
-try:
-    os.fork
-except AttributeError:
-    raise unittest.SkipTest("os.fork not defined -- skipping test_wait3")
+if not hassattr(os, 'fork'):
+    raise unittest.SkipTest("os.fork not defined")
 
-try:
-    os.wait3
-except AttributeError:
-    raise unittest.SkipTest("os.wait3 not defined -- skipping test_wait3")
+if not hasattr(os, 'wait3'):
+    raise unittest.SkipTest("os.wait3 not defined")
 
 class Wait3Test(ForkWait):
     def wait_impl(self, cpid):

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

From python-checkins at python.org  Wed Nov 14 21:23:12 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 21:23:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3Y1xwc5Bd3zRZj@mail.python.org>

http://hg.python.org/cpython/rev/75e9c5b6bb1b
changeset:   80430:75e9c5b6bb1b
parent:      80429:520adfab957e
parent:      80426:399e59ad0a70
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 15:22:56 2012 -0500
summary:
  merge

files:
  Lib/test/test_complex.py |   2 ++
  Misc/NEWS                |   3 +++
  Objects/complexobject.c  |  12 ++++++------
  3 files changed, 11 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -221,6 +221,8 @@
         self.assertRaises(TypeError, complex, OS(None))
         self.assertRaises(TypeError, complex, NS(None))
         self.assertRaises(TypeError, complex, {})
+        self.assertRaises(TypeError, complex, NS(1.5))
+        self.assertRaises(TypeError, complex, NS(1))
 
         self.assertAlmostEqual(complex("1+10j"), 1+10j)
         self.assertAlmostEqual(complex(10), 10+0j)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16290: A float return value from the __complex__ special method is no
+  longer accepted in the complex() constructor.
+
 - Issue #16416: On Mac OS X, operating system data are now always
   encoded/decoded to/from UTF-8/surrogateescape, instead of the locale encoding
   (which may be ASCII if no locale environment variable is set), to avoid
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -271,6 +271,12 @@
     if (f) {
         PyObject *res = PyObject_CallFunctionObjArgs(f, NULL);
         Py_DECREF(f);
+        if (res != NULL && !PyComplex_Check(res)) {
+            PyErr_SetString(PyExc_TypeError,
+                "__complex__ should return a complex object");
+            Py_DECREF(res);
+            return NULL;
+        }
         return res;
     }
     return NULL;
@@ -296,12 +302,6 @@
     newop = try_complex_special_method(op);
 
     if (newop) {
-        if (!PyComplex_Check(newop)) {
-            PyErr_SetString(PyExc_TypeError,
-                "__complex__ should return a complex object");
-            Py_DECREF(newop);
-            return cv;
-        }
         cv = ((PyComplexObject *)newop)->cval;
         Py_DECREF(newop);
         return cv;

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

From python-checkins at python.org  Wed Nov 14 21:32:50 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 14 Nov 2012 21:32:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Update_the_des?=
 =?utf-8?q?cription_of_which_package_versions_PyPI_displays_=28issue_=2316?=
 =?utf-8?b?NDAwKS4=?=
Message-ID: <3Y1y7k35QhzRYD@mail.python.org>

http://hg.python.org/cpython/rev/2d266ce80712
changeset:   80431:2d266ce80712
branch:      3.2
parent:      80418:a580cf4ab940
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 14 12:12:30 2012 -0800
summary:
  Update the description of which package versions PyPI displays (issue #16400).

files:
  Doc/distutils/packageindex.rst |  6 +++---
  Misc/NEWS                      |  3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -43,9 +43,9 @@
 Maintainers may edit the package information, but not designate other Owners or
 Maintainers.
 
-By default PyPI will list all versions of a given package. To hide certain
-versions, the Hidden property should be set to yes. This must be edited through
-the web interface.
+By default PyPI displays only the newest version of a given package. The web
+interface lets one change this default behavior and manually select which
+versions to display and hide.
 
 
 .. _pypirc:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -716,6 +716,9 @@
 Documentation
 -------------
 
+- Issue #16400: Update the description of which versions of a given package
+  PyPI displays.
+
 - Issue #15677: Document that zlib and gzip accept a compression level of 0 to
   mean 'no compression'. Patch by Brian Brazil.
 

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

From python-checkins at python.org  Wed Nov 14 21:32:51 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 14 Nov 2012 21:32:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_from_3=2E2=3A_update_the_PyPI_docs_regarding_listing_ver?=
 =?utf-8?b?c2lvbnMgKGlzc3VlICMxNjQwMCku?=
Message-ID: <3Y1y7l5l3FzRZN@mail.python.org>

http://hg.python.org/cpython/rev/ec037316a445
changeset:   80432:ec037316a445
branch:      3.3
parent:      80424:afb476dc202f
parent:      80431:2d266ce80712
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 14 12:24:21 2012 -0800
summary:
  Merge from 3.2: update the PyPI docs regarding listing versions (issue #16400).

files:
  Doc/distutils/packageindex.rst |  6 +++---
  Misc/NEWS                      |  3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -43,9 +43,9 @@
 Maintainers may edit the package information, but not designate other Owners or
 Maintainers.
 
-By default PyPI will list all versions of a given package. To hide certain
-versions, the Hidden property should be set to yes. This must be edited through
-the web interface.
+By default PyPI displays only the newest version of a given package. The web
+interface lets one change this default behavior and manually select which
+versions to display and hide.
 
 
 .. _pypirc:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -266,6 +266,9 @@
 Documentation
 -------------
 
+- Issue #16400: Update the description of which versions of a given package
+  PyPI displays.
+
 - Issue #15677: Document that zlib and gzip accept a compression level of 0 to
   mean 'no compression'. Patch by Brian Brazil.
 

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

From python-checkins at python.org  Wed Nov 14 21:32:53 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 14 Nov 2012 21:32:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_update_the_PyPI_docs_regarding_listi?=
 =?utf-8?q?ng_versions_=28issue_=2316400=29=2E?=
Message-ID: <3Y1y7n13HPzRZZ@mail.python.org>

http://hg.python.org/cpython/rev/e4175daac740
changeset:   80433:e4175daac740
parent:      80430:75e9c5b6bb1b
parent:      80432:ec037316a445
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 14 12:28:38 2012 -0800
summary:
  Merge from 3.3: update the PyPI docs regarding listing versions (issue #16400).

files:
  Doc/distutils/packageindex.rst |  6 +++---
  Misc/NEWS                      |  3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -43,9 +43,9 @@
 Maintainers may edit the package information, but not designate other Owners or
 Maintainers.
 
-By default PyPI will list all versions of a given package. To hide certain
-versions, the Hidden property should be set to yes. This must be edited through
-the web interface.
+By default PyPI displays only the newest version of a given package. The web
+interface lets one change this default behavior and manually select which
+versions to display and hide.
 
 
 .. _pypirc:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -373,6 +373,9 @@
 Documentation
 -------------
 
+- Issue #16400: Update the description of which versions of a given package
+  PyPI displays.
+
 - Issue #15677: Document that zlib and gzip accept a compression level of 0 to
   mean 'no compression'. Patch by Brian Brazil.
 

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

From python-checkins at python.org  Wed Nov 14 21:39:08 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 14 Nov 2012 21:39:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?=
 =?utf-8?q?3=2E2=3A_update_PyPI_docs_regarding_listing_versions_=28issue_?=
 =?utf-8?b?IzE2NDAwKS4=?=
Message-ID: <3Y1yH004ftzRYD@mail.python.org>

http://hg.python.org/cpython/rev/7db2a27c07be
changeset:   80434:7db2a27c07be
branch:      2.7
parent:      80423:b25dcfe2b244
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 14 12:36:53 2012 -0800
summary:
  Backport from 3.2: update PyPI docs regarding listing versions (issue #16400).

files:
  Doc/distutils/packageindex.rst |  6 +++---
  Misc/NEWS                      |  3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -43,9 +43,9 @@
 Maintainers may edit the package information, but not designate other Owners or
 Maintainers.
 
-By default PyPI will list all versions of a given package. To hide certain
-versions, the Hidden property should be set to yes. This must be edited through
-the web interface.
+By default PyPI displays only the newest version of a given package. The web
+interface lets one change this default behavior and manually select which
+versions to display and hide.
 
 
 .. _pypirc:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -558,6 +558,9 @@
 Documentation
 -------------
 
+- Issue #16400: Update the description of which versions of a given package
+  PyPI displays.
+
 - Issue #15677: Document that zlib and gzip accept a compression level of 0 to
   mean 'no compression'. Patch by Brian Brazil.
 

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

From python-checkins at python.org  Wed Nov 14 21:50:05 2012
From: python-checkins at python.org (brett.cannon)
Date: Wed, 14 Nov 2012 21:50:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_a_typo?=
Message-ID: <3Y1yWd0c18zRRx@mail.python.org>

http://hg.python.org/cpython/rev/7f0a2932706f
changeset:   80435:7f0a2932706f
parent:      80433:e4175daac740
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 15:49:55 2012 -0500
summary:
  Fix a typo

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


diff --git a/Lib/test/test_wait3.py b/Lib/test/test_wait3.py
--- a/Lib/test/test_wait3.py
+++ b/Lib/test/test_wait3.py
@@ -7,7 +7,7 @@
 from test.fork_wait import ForkWait
 from test.support import run_unittest, reap_children
 
-if not hassattr(os, 'fork'):
+if not hasattr(os, 'fork'):
     raise unittest.SkipTest("os.fork not defined")
 
 if not hasattr(os, 'wait3'):

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

From python-checkins at python.org  Wed Nov 14 23:50:07 2012
From: python-checkins at python.org (philip.jenvey)
Date: Wed, 14 Nov 2012 23:50:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogZG9uJ3QgZ2NfY29s?=
 =?utf-8?q?lect_on_CPython_to_guarantee_a_lack_of_ref_cycles_=28thanks_Ant?=
 =?utf-8?q?oine=29?=
Message-ID: <3Y21B73HfNzRWT@mail.python.org>

http://hg.python.org/cpython/rev/dd60de9d8dd6
changeset:   80436:dd60de9d8dd6
branch:      3.2
parent:      80431:2d266ce80712
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Wed Nov 14 14:37:24 2012 -0800
summary:
  don't gc_collect on CPython to guarantee a lack of ref cycles (thanks Antoine)

files:
  Lib/test/test_exceptions.py |  14 +++++++++-----
  1 files changed, 9 insertions(+), 5 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
@@ -7,8 +7,8 @@
 import weakref
 import errno
 
-from test.support import (TESTFN, unlink, run_unittest, captured_output,
-                          gc_collect, cpython_only)
+from test.support import (TESTFN, captured_output, check_impl_detail,
+                          cpython_only, gc_collect, run_unittest, unlink)
 
 # XXX This is not really enough, each *operation* should be tested!
 
@@ -493,7 +493,9 @@
             e.__context__ = None
             obj = None
             obj = wr()
-            gc_collect()
+            # guarantee no ref cycles on CPython (don't gc_collect)
+            if check_impl_detail(cpython=False):
+                gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -510,7 +512,8 @@
             except MyException:
                 pass
         obj = None
-        gc_collect()
+        if check_impl_detail(cpython=False):
+            gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -525,7 +528,8 @@
         with Context():
             inner_raising_func()
         obj = None
-        gc_collect()
+        if check_impl_detail(cpython=False):
+            gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 

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

From python-checkins at python.org  Wed Nov 14 23:50:08 2012
From: python-checkins at python.org (philip.jenvey)
Date: Wed, 14 Nov 2012 23:50:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
	=?utf-8?q?_merge_3=2E2?=
Message-ID: <3Y21B85WrVzRbW@mail.python.org>

http://hg.python.org/cpython/rev/d00d1e3587e3
changeset:   80437:d00d1e3587e3
branch:      3.3
parent:      80432:ec037316a445
parent:      80436:dd60de9d8dd6
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Wed Nov 14 14:49:49 2012 -0800
summary:
  merge 3.2

files:
  Lib/test/test_exceptions.py |  15 ++++++++++-----
  1 files changed, 10 insertions(+), 5 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
@@ -7,8 +7,9 @@
 import weakref
 import errno
 
-from test.support import (TESTFN, unlink, run_unittest, captured_output,
-                          gc_collect, cpython_only, no_tracing)
+from test.support import (TESTFN, captured_output, check_impl_detail,
+                          cpython_only, gc_collect, run_unittest, no_tracing,
+                          unlink)
 
 class NaiveException(Exception):
     def __init__(self, x):
@@ -551,7 +552,9 @@
             e.__context__ = None
             obj = None
             obj = wr()
-            gc_collect()
+            # guarantee no ref cycles on CPython (don't gc_collect)
+            if check_impl_detail(cpython=False):
+                gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -568,7 +571,8 @@
             except MyException:
                 pass
         obj = None
-        gc_collect()
+        if check_impl_detail(cpython=False):
+            gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -583,7 +587,8 @@
         with Context():
             inner_raising_func()
         obj = None
-        gc_collect()
+        if check_impl_detail(cpython=False):
+            gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 

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

From python-checkins at python.org  Wed Nov 14 23:50:10 2012
From: python-checkins at python.org (philip.jenvey)
Date: Wed, 14 Nov 2012 23:50:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4z?=
Message-ID: <3Y21BB0yn1zRbt@mail.python.org>

http://hg.python.org/cpython/rev/0b70b4ca7b6f
changeset:   80438:0b70b4ca7b6f
parent:      80435:7f0a2932706f
parent:      80437:d00d1e3587e3
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Wed Nov 14 14:51:44 2012 -0800
summary:
  merge 3.3

files:
  Lib/test/test_exceptions.py |  15 ++++++++++-----
  1 files changed, 10 insertions(+), 5 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
@@ -7,8 +7,9 @@
 import weakref
 import errno
 
-from test.support import (TESTFN, unlink, run_unittest, captured_output,
-                          check_warnings, gc_collect, cpython_only, no_tracing)
+from test.support import (TESTFN, captured_output, check_impl_detail,
+                          check_warnings, cpython_only, gc_collect, run_unittest,
+                          no_tracing, unlink)
 
 class NaiveException(Exception):
     def __init__(self, x):
@@ -551,7 +552,9 @@
             e.__context__ = None
             obj = None
             obj = wr()
-            gc_collect()
+            # guarantee no ref cycles on CPython (don't gc_collect)
+            if check_impl_detail(cpython=False):
+                gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -568,7 +571,8 @@
             except MyException:
                 pass
         obj = None
-        gc_collect()
+        if check_impl_detail(cpython=False):
+            gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -583,7 +587,8 @@
         with Context():
             inner_raising_func()
         obj = None
-        gc_collect()
+        if check_impl_detail(cpython=False):
+            gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 

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

From python-checkins at python.org  Thu Nov 15 04:12:12 2012
From: python-checkins at python.org (daniel.holth)
Date: Thu, 15 Nov 2012 04:12:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_keys_are_case-insenstive?=
Message-ID: <3Y270X66TvzRbF@mail.python.org>

http://hg.python.org/peps/rev/899678d7d1bf
changeset:   4587:899678d7d1bf
user:        Daniel Holth <dholth at fastmail.fm>
date:        Wed Nov 14 22:12:04 2012 -0500
summary:
  keys are case-insenstive

files:
  pep-0426.txt |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/pep-0426.txt b/pep-0426.txt
--- a/pep-0426.txt
+++ b/pep-0426.txt
@@ -35,8 +35,8 @@
 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 maximum line length, followed by a blank line and an
-arbitrary payload.  It is parseable by the ``email`` module with an
-appropriate ``email.policy.Policy()``.
+arbitrary payload.  The keys are case-insensitive.  It is parseable by
+the ``email`` module with an appropriate ``email.policy.Policy()``.
 
 When ``metadata`` is a Unicode string,
 ```email.parser.Parser().parsestr(metadata)`` is a serviceable parser.

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

From solipsis at pitrou.net  Thu Nov 15 05:57:29 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 15 Nov 2012 05:57:29 +0100
Subject: [Python-checkins] Daily reference leaks (0b70b4ca7b6f): sum=0
Message-ID: <E1TYrW5-0008LF-W9@ap.vmr.nerim.net>

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



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

From python-checkins at python.org  Thu Nov 15 07:10:53 2012
From: python-checkins at python.org (georg.brandl)
Date: Thu, 15 Nov 2012 07:10:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Remove_version?=
 =?utf-8?q?added_from_the_tutorial=2C_at_a_location_where_it_produces_more?=
Message-ID: <3Y2Byj6P1qzRcx@mail.python.org>

http://hg.python.org/cpython/rev/457c0c9c7893
changeset:   80439:457c0c9c7893
branch:      2.7
parent:      80434:7db2a27c07be
user:        Georg Brandl <georg at python.org>
date:        Thu Nov 15 07:10:27 2012 +0100
summary:
  Remove versionadded from the tutorial, at a location where it produces more questions than it answers.

files:
  Doc/tutorial/datastructures.rst |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -229,8 +229,6 @@
 such a common need, a built-in function ``sum(sequence)`` is already provided,
 and works exactly like this.
 
-.. versionadded:: 2.3
-
 
 List Comprehensions
 -------------------

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

From python-checkins at python.org  Thu Nov 15 15:20:37 2012
From: python-checkins at python.org (vinay.sajip)
Date: Thu, 15 Nov 2012 15:20:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Allow_configuration_of_han?=
	=?utf-8?q?dler_properties=2E?=
Message-ID: <3Y2Pqn738WzRh3@mail.python.org>

http://hg.python.org/cpython/rev/a81ae412174a
changeset:   80440:a81ae412174a
parent:      80438:0b70b4ca7b6f
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Thu Nov 15 14:20:18 2012 +0000
summary:
  Allow configuration of handler properties.

files:
  Lib/logging/config.py    |   4 +++
  Lib/test/test_logging.py |  35 ++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+), 0 deletions(-)


diff --git a/Lib/logging/config.py b/Lib/logging/config.py
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -710,6 +710,7 @@
                 'address' in config:
                 config['address'] = self.as_tuple(config['address'])
             factory = klass
+        props = config.pop('.', None)
         kwargs = dict([(k, config[k]) for k in config if valid_ident(k)])
         try:
             result = factory(**kwargs)
@@ -728,6 +729,9 @@
             result.setLevel(logging._checkLevel(level))
         if filters:
             self.add_filters(result, filters)
+        if props:
+            for name, value in props.items():
+                setattr(result, name, value)
         return result
 
     def add_handlers(self, logger, handlers):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -2389,6 +2389,32 @@
         },
     }
 
+    # As config0, but with properties
+    config14 = {
+        'version': 1,
+        'formatters': {
+            'form1' : {
+                'format' : '%(levelname)s ++ %(message)s',
+            },
+        },
+        'handlers' : {
+            'hand1' : {
+                'class' : 'logging.StreamHandler',
+                'formatter' : 'form1',
+                'level' : 'NOTSET',
+                'stream'  : 'ext://sys.stdout',
+                '.': {
+                    'foo': 'bar',
+                    'terminator': '!\n',
+                }
+            },
+        },
+        'root' : {
+            'level' : 'WARNING',
+            'handlers' : ['hand1'],
+        },
+    }
+
     def apply_config(self, conf):
         logging.config.dictConfig(conf)
 
@@ -2625,6 +2651,15 @@
     def test_config13_failure(self):
         self.assertRaises(Exception, self.apply_config, self.config13)
 
+    def test_config14_ok(self):
+        with captured_stdout() as output:
+            self.apply_config(self.config14)
+            h = logging._handlers['hand1']
+            self.assertEqual(h.foo, 'bar')
+            self.assertEqual(h.terminator, '!\n')
+            logging.warning('Exclamation')
+            self.assertTrue(output.getvalue().endswith('Exclamation!\n'))
+
     @unittest.skipUnless(threading, 'listen() needs threading to work')
     def setup_via_listener(self, text, verify=None):
         text = text.encode("utf-8")

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

From python-checkins at python.org  Thu Nov 15 15:22:42 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 15:22:42 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devinabox=3A_Run_coverage=2Epy_with_f?=
 =?utf-8?q?ullcoverage=2C_along_the_way_refactoring_the_code=2E?=
Message-ID: <3Y2PtB6VMLzRgl@mail.python.org>

http://hg.python.org/devinabox/rev/9b213879e189
changeset:   42:9b213879e189
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 23:19:18 2012 -0500
summary:
  Run coverage.py with fullcoverage, along the way refactoring the code.

files:
  make_a_box.py |  83 ++++++++++++++++++++++++++------------
  1 files changed, 57 insertions(+), 26 deletions(-)


diff --git a/make_a_box.py b/make_a_box.py
--- a/make_a_box.py
+++ b/make_a_box.py
@@ -84,13 +84,13 @@
 
     @property
     def directory(self):
-        return os.path.basename(self.url)
+        return os.path.abspath(os.path.basename(self.url))
 
     def create(self):
         """Clone an Hg repository to 'directory'."""
         if os.path.exists(self.directory):
             subprocess.check_call(['hg', 'pull', '-u', self.url],
-                                  cwd = self.directory)
+                                  cwd=self.directory)
         else:
             subprocess.check_call(['hg', 'clone', self.url, self.directory])
 
@@ -127,32 +127,63 @@
     size = 133  # Includes the coverage report
     docs = os.path.join('coverage_report', 'index.html')
 
-    # XXX still requires __main__.py in coveragepy checkout
+    @contextlib.contextmanager
+    def build_cpython(self):
+        self.executable = build_cpython.main()
+        if not self.executable:
+            print('No CPython executable found')
+            sys.exit(1)
+        self.cpython_dir = os.path.dirname(self.executable)
+        yield
+        print('Cleaning up the CPython build ...')
+        subprocess.check_call(['make', 'distclean'])
+
+    @contextlib.contextmanager
+    def build_coveragepy(self):
+        env = os.environ.copy()
+        env['CPPPATH'] = '-I {} -I {}'.format(self.cpython_dir,
+                                     os.path.join(self.cpython_dir, 'Include'))
+        with change_cwd(self.coveragepy_dir):
+            print('Compiling coverage.py extension(s) ...')
+            cmd = [self.executable, 'setup.py', 'build_ext', '--inplace']
+            subprocess.check_call(cmd, env=env)
+            yield
+            # XXX clean up tracer.so; distribute?
+
+    def generate_coveragepy_command(self, command, *args):
+        return [self.executable, self.coveragepy_dir, command,
+                '--include', os.path.join(self.cpython_dir, 'Lib', '*'),
+                '--omit', '"Lib/test/*,Lib/*/tests/*"'] + list(args)
+
+    @contextlib.contextmanager
+    def run_coveragepy(self):
+        print('Running coverage ...')
+        regrtest_path = os.path.join(self.cpython_dir, 'Lib', 'test',
+                                     'regrtest.py')
+        fullcoverage = os.path.join(self.coveragepy_dir, 'coverage',
+                                    'fullcoverage')
+        env = os.environ.copy()
+        env['PYTHONPATH'] = fullcoverage
+        cmd = self.generate_coveragepy_command('run', '--pylib', regrtest_path,
+                                               'test_imp')
+        subprocess.check_call(cmd, env=env)
+        yield
+        os.unlink('.coverage')
+
+    def report_coveragepy(self):
+        print('Generating report ...')
+        cmd = self.generate_coveragepy_command('html', '-i', '-d',
+                                os.path.join(self.root_dir, 'coverage_report'))
+        subprocess.check_call(cmd)
+
     def build(self):
         """Run coverage over CPython."""
-        # Build Python
-        executable = build_cpython.main()
-        # Run coverage
-        if not executable:
-            print('No CPython executable found')
-            sys.exit(1)
-        print('Running coverage ...')
-        regrtest_path = os.path.join('cpython', 'Lib', 'test',
-                                    'regrtest.py')
-        try:
-            subprocess.check_call([executable, self.directory, 'run', '--pylib',
-                                   regrtest_path])
-        finally:
-            # Clean up from the test run
-            shutil.rmtree('build')
-        # Generate the HTML report
-        print('Generating report ...')
-        subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit',
-                         '"*/test/*,*/tests/*"', '-d', 'coverage_report'])
-        # ``make distclean`` as you don't want to distribute your own build
-        print('Cleaning up the CPython build ...')
-        with change_cwd('cpython'):
-            subprocess.check_call(['make', 'distclean'])
+        self.coveragepy_dir = self.directory
+        self.root_dir = os.path.dirname(self.directory)
+        with self.build_cpython(), self.build_coveragepy():
+            with change_cwd(self.cpython_dir):
+                with self.run_coveragepy():
+                    self.report_coveragepy()
 
 
 class Mercurial(Provider):

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

From python-checkins at python.org  Thu Nov 15 15:22:44 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 15:22:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devinabox=3A_Tweak_how_some_stuff_is_?=
 =?utf-8?q?calculated_and_remove_some_debugging_stuff=2E?=
Message-ID: <3Y2PtD1FzPzRhD@mail.python.org>

http://hg.python.org/devinabox/rev/d2c984dd06d4
changeset:   43:d2c984dd06d4
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 23:36:04 2012 -0500
summary:
  Tweak how some stuff is calculated and remove some debugging stuff.

files:
  make_a_box.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/make_a_box.py b/make_a_box.py
--- a/make_a_box.py
+++ b/make_a_box.py
@@ -151,9 +151,11 @@
             # XXX clean up tracer.so; distribute?
 
     def generate_coveragepy_command(self, command, *args):
+        exclude = '{},{}'.format(os.path.join('Lib', 'test', '*'),
+                                 os.path.join('Lib', '*', 'tests', '*'))
         return [self.executable, self.coveragepy_dir, command,
                 '--include', os.path.join(self.cpython_dir, 'Lib', '*'),
-                '--omit', '"Lib/test/*,Lib/*/tests/*"'] + list(args)
+                '--omit', exclude] + list(args)
 
     @contextlib.contextmanager
     def run_coveragepy(self):
@@ -164,8 +166,7 @@
                                     'fullcoverage')
         env = os.environ.copy()
         env['PYTHONPATH'] = fullcoverage
-        cmd = self.generate_coveragepy_command('run', '--pylib', regrtest_path,
-                                               'test_imp')
+        cmd = self.generate_coveragepy_command('run', '--pylib', regrtest_path)
         subprocess.check_call(cmd, env=env)
         yield
         os.unlink('.coverage')

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

From python-checkins at python.org  Thu Nov 15 15:22:45 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 15:22:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devinabox=3A_Clean_up_module_docstrin?=
	=?utf-8?q?g=2E?=
Message-ID: <3Y2PtF3CwKzRgl@mail.python.org>

http://hg.python.org/devinabox/rev/b69935897e39
changeset:   44:b69935897e39
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 23:40:39 2012 -0500
summary:
  Clean up module docstring.

files:
  make_a_box.py |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/make_a_box.py b/make_a_box.py
--- a/make_a_box.py
+++ b/make_a_box.py
@@ -2,13 +2,13 @@
 """Python-Dev In a Box: everything you need to contribute to Python in under
 700 MB.
 
-This script will clone, checkout, download, or ask you to download everything
-you need to contribute to (C)Python's development short of a C compiler. It
-will also "build" everything so that users do not need to do **everything**
-from scratch. This also allows for easy offline use.
+This script will clone, checkout, or (ask you to) download almost everything
+you need to contribute to (C)Python's development. It will also "build"
+everything so that users do not need to do **everything** from scratch. This
+also allows for easy offline use.
 
-There are also some scripts provided along side this one to help in executing
-common tasks.
+Beyond this script itself, there are other scripts provided along side this one
+to help in executing common tasks.
 
 """
 import abc

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

From python-checkins at python.org  Thu Nov 15 15:22:48 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 15:22:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Tweak_coverage_report_com?=
	=?utf-8?q?mand=2E?=
Message-ID: <3Y2PtJ5Jj5zRhD@mail.python.org>

http://hg.python.org/devguide/rev/5e3214e7b92b
changeset:   565:5e3214e7b92b
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 23:22:53 2012 -0500
summary:
  Tweak coverage report command.

files:
  coverage.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/coverage.rst b/coverage.rst
--- a/coverage.rst
+++ b/coverage.rst
@@ -133,7 +133,7 @@
 But one of the strengths of coverage.py is its HTML-based reports which let
 you visually see what lines of code were not tested::
 
-    ./python COVERAGDIR html -i --include="Lib/*" --omit="*/test/*,*/tests/*,Tools/*"
+    ./python COVERAGDIR html -i --include=`pwd`/Lib/* --omit="Lib/test/*,Lib/*/tests/*"
 
 This will generate an HTML report in a directory named ``htmlcov`` which
 ignores any errors that may arise and ignores modules for which test coverage is
@@ -190,6 +190,7 @@
 This will give you the most complete coverage possible for CPython's standard
 library.
 
+
 .. _coverage.py: http://nedbatchelder.com/code/coverage/
 
 

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

From python-checkins at python.org  Thu Nov 15 15:22:50 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 15:22:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Drop_a_blank_line=2E?=
Message-ID: <3Y2PtL0FLNzRj3@mail.python.org>

http://hg.python.org/devguide/rev/3dc14c30667e
changeset:   566:3dc14c30667e
user:        Brett Cannon <brett at python.org>
date:        Wed Nov 14 23:23:20 2012 -0500
summary:
  Drop a blank line.

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


diff --git a/coverage.rst b/coverage.rst
--- a/coverage.rst
+++ b/coverage.rst
@@ -190,7 +190,6 @@
 This will give you the most complete coverage possible for CPython's standard
 library.
 
-
 .. _coverage.py: http://nedbatchelder.com/code/coverage/
 
 

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

From python-checkins at python.org  Thu Nov 15 15:30:56 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 15 Nov 2012 15:30:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MTQ0?=
 =?utf-8?q?=3A_Fix_misleading_sentence_in_reference/import=2E?=
Message-ID: <3Y2Q3h5trMzRjq@mail.python.org>

http://hg.python.org/cpython/rev/a8ca14983ab1
changeset:   80441:a8ca14983ab1
branch:      3.3
parent:      80437:d00d1e3587e3
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 15 16:28:21 2012 +0200
summary:
  Issue #16144: Fix misleading sentence in reference/import.

Patch by Manuel P?gouri?-Gonnard

files:
  Doc/reference/import.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -44,9 +44,9 @@
 
 .. versionchanged:: 3.3
    The import system has been updated to fully implement the second phase
-   of PEP 302. There is no longer any implicit import machinery - the full
+   of :pep:`302`. There is no longer any implicit import machinery - the full
    import system is exposed through :data:`sys.meta_path`. In addition,
-   native namespace package support has been implemented (see PEP 420).
+   native namespace package support has been implemented (see :pep:`420`).
 
 
 :mod:`importlib`
@@ -219,9 +219,9 @@
 interfaces are referred to as :term:`importers <importer>` - they return
 themselves when they find that they can load the requested module.
 
-Python includes a number of default finders and importers.  One
-knows how to locate frozen modules, and another knows how to locate
-built-in modules.  A third default finder searches an :term:`import path`
+Python includes a number of default finders and importers.  The first one
+knows how to locate built-in modules, and the second knows how to locate
+frozen modules.  A third default finder searches an :term:`import path`
 for modules.  The :term:`import path` is a list of locations that may
 name file system paths or zip files.  It can also be extended to search
 for any locatable resource, such as those identified by URLs.

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

From python-checkins at python.org  Thu Nov 15 15:30:58 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 15 Nov 2012 15:30:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316144=3A_Fix_misleading_sentence_in_refer?=
 =?utf-8?q?ence/import=2E?=
Message-ID: <3Y2Q3k19DYzRhx@mail.python.org>

http://hg.python.org/cpython/rev/9961a0dafcc7
changeset:   80442:9961a0dafcc7
parent:      80438:0b70b4ca7b6f
parent:      80441:a8ca14983ab1
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 15 16:28:48 2012 +0200
summary:
  Merge issue #16144: Fix misleading sentence in reference/import.

Patch by Manuel P?gouri?-Gonnard

files:
  Doc/reference/import.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -44,9 +44,9 @@
 
 .. versionchanged:: 3.3
    The import system has been updated to fully implement the second phase
-   of PEP 302. There is no longer any implicit import machinery - the full
+   of :pep:`302`. There is no longer any implicit import machinery - the full
    import system is exposed through :data:`sys.meta_path`. In addition,
-   native namespace package support has been implemented (see PEP 420).
+   native namespace package support has been implemented (see :pep:`420`).
 
 
 :mod:`importlib`
@@ -219,9 +219,9 @@
 interfaces are referred to as :term:`importers <importer>` - they return
 themselves when they find that they can load the requested module.
 
-Python includes a number of default finders and importers.  One
-knows how to locate frozen modules, and another knows how to locate
-built-in modules.  A third default finder searches an :term:`import path`
+Python includes a number of default finders and importers.  The first one
+knows how to locate built-in modules, and the second knows how to locate
+frozen modules.  A third default finder searches an :term:`import path`
 for modules.  The :term:`import path` is a list of locations that may
 name file system paths or zip files.  It can also be extended to search
 for any locatable resource, such as those identified by URLs.

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

From python-checkins at python.org  Thu Nov 15 15:30:59 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 15 Nov 2012 15:30:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_Merge_heads?=
Message-ID: <3Y2Q3l3PmYzRjl@mail.python.org>

http://hg.python.org/cpython/rev/3aa530c2db06
changeset:   80443:3aa530c2db06
parent:      80440:a81ae412174a
parent:      80442:9961a0dafcc7
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 15 16:30:30 2012 +0200
summary:
  Merge heads

files:
  Doc/reference/import.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -44,9 +44,9 @@
 
 .. versionchanged:: 3.3
    The import system has been updated to fully implement the second phase
-   of PEP 302. There is no longer any implicit import machinery - the full
+   of :pep:`302`. There is no longer any implicit import machinery - the full
    import system is exposed through :data:`sys.meta_path`. In addition,
-   native namespace package support has been implemented (see PEP 420).
+   native namespace package support has been implemented (see :pep:`420`).
 
 
 :mod:`importlib`
@@ -219,9 +219,9 @@
 interfaces are referred to as :term:`importers <importer>` - they return
 themselves when they find that they can load the requested module.
 
-Python includes a number of default finders and importers.  One
-knows how to locate frozen modules, and another knows how to locate
-built-in modules.  A third default finder searches an :term:`import path`
+Python includes a number of default finders and importers.  The first one
+knows how to locate built-in modules, and the second knows how to locate
+frozen modules.  A third default finder searches an :term:`import path`
 for modules.  The :term:`import path` is a list of locations that may
 name file system paths or zip files.  It can also be extended to search
 for any locatable resource, such as those identified by URLs.

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

From python-checkins at python.org  Thu Nov 15 16:14:51 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 16:14:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devinabox=3A_Minor_comments=2E?=
Message-ID: <3Y2R2M3KgDzRkP@mail.python.org>

http://hg.python.org/devinabox/rev/92da896bd4a0
changeset:   45:92da896bd4a0
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 10:14:42 2012 -0500
summary:
  Minor comments.

files:
  make_a_box.py |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/make_a_box.py b/make_a_box.py
--- a/make_a_box.py
+++ b/make_a_box.py
@@ -144,11 +144,14 @@
         env['CPPPATH'] = '-I {} -I {}'.format(self.cpython_dir,
                                      os.path.join(self.cpython_dir, 'Include'))
         with change_cwd(self.coveragepy_dir):
+            # Don't want to use venv because we want the file paths to match
+            # up with the repo and not installation locations.
             print('Compiling coverage.py extension(s) ...')
             cmd = [self.executable, 'setup.py', 'build_ext', '--inplace']
             subprocess.check_call(cmd, env=env)
             yield
-            # XXX clean up tracer.so; distribute?
+            # XXX clean up tracer.so and any other build directories;
+            #     leave distribute for those that want to build themselves
 
     def generate_coveragepy_command(self, command, *args):
         exclude = '{},{}'.format(os.path.join('Lib', 'test', '*'),

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

From python-checkins at python.org  Thu Nov 15 19:24:20 2012
From: python-checkins at python.org (richard.oudkerk)
Date: Thu, 15 Nov 2012 19:24:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NDgx?=
 =?utf-8?q?=3A_multiprocessing_no_longer_leaks_process_handles_on_Windows?=
 =?utf-8?q?=2E?=
Message-ID: <3Y2WF04ck6zRhZ@mail.python.org>

http://hg.python.org/cpython/rev/c574ce78cd61
changeset:   80444:c574ce78cd61
branch:      3.3
parent:      80441:a8ca14983ab1
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Thu Nov 15 18:16:35 2012 +0000
summary:
  Issue #16481: multiprocessing no longer leaks process handles on Windows.

files:
  Lib/multiprocessing/forking.py |  1 +
  Misc/NEWS                      |  2 ++
  2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -233,6 +233,7 @@
                 self.returncode = None
                 self._handle = hp
                 self.sentinel = int(hp)
+                util.Finalize(self, _winapi.CloseHandle, (self.sentinel,))
 
                 # send information to child
                 Popen._tls.process_handle = int(hp)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,8 @@
 Library
 -------
 
+- Issue #16481: multiprocessing no longer leaks process handles on Windows.
+
 - Issue #16140: The subprocess module no longer double closes its child
   subprocess.PIPE parent file descriptors on child error prior to exec().
 

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

From python-checkins at python.org  Thu Nov 15 19:24:22 2012
From: python-checkins at python.org (richard.oudkerk)
Date: Thu, 15 Nov 2012 19:24:22 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316481=3A_Merge?=
Message-ID: <3Y2WF20CTpzRj4@mail.python.org>

http://hg.python.org/cpython/rev/cb612c5f30cb
changeset:   80445:cb612c5f30cb
parent:      80443:3aa530c2db06
parent:      80444:c574ce78cd61
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Thu Nov 15 18:22:23 2012 +0000
summary:
  Issue #16481: Merge

files:
  Lib/multiprocessing/forking.py |  1 +
  Misc/NEWS                      |  2 ++
  2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -233,6 +233,7 @@
                 self.returncode = None
                 self._handle = hp
                 self.sentinel = int(hp)
+                util.Finalize(self, _winapi.CloseHandle, (self.sentinel,))
 
                 # send information to child
                 Popen._tls.process_handle = int(hp)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,8 @@
 Library
 -------
 
+- Issue #16481: multiprocessing no longer leaks process handles on Windows.
+
 - Issue #12428: Add a pure Python implementation of functools.partial().
   Patch by Brian Thorne.
 

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

From python-checkins at python.org  Thu Nov 15 20:33:39 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 20:33:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devinabox=3A_Couple_of_things=3A?=
Message-ID: <3Y2Xmz4S8pzRhk@mail.python.org>

http://hg.python.org/devinabox/rev/cbe2b5ca4a01
changeset:   46:cbe2b5ca4a01
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 14:33:22 2012 -0500
summary:
  Couple of things:

* Fix a bug where CPPFLAGS was misnamed
* Clean up after the build of coverage.py
* Fix the 'make distclean' call to occur in the proper directory

files:
  make_a_box.py |  12 +++++++-----
  1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/make_a_box.py b/make_a_box.py
--- a/make_a_box.py
+++ b/make_a_box.py
@@ -136,12 +136,13 @@
         self.cpython_dir = os.path.dirname(self.executable)
         yield
         print('Cleaning up the CPython build ...')
-        subprocess.check_call(['make', 'distclean'])
+        with change_cwd(self.cpython_dir):
+            subprocess.check_call(['make', 'distclean'])
 
     @contextlib.contextmanager
     def build_coveragepy(self):
         env = os.environ.copy()
-        env['CPPPATH'] = '-I {} -I {}'.format(self.cpython_dir,
+        env['CPPFLAGS'] = '-I {} -I {}'.format(self.cpython_dir,
                                      os.path.join(self.cpython_dir, 'Include'))
         with change_cwd(self.coveragepy_dir):
             # Don't want to use venv because we want the file paths to match
@@ -150,8 +151,9 @@
             cmd = [self.executable, 'setup.py', 'build_ext', '--inplace']
             subprocess.check_call(cmd, env=env)
             yield
-            # XXX clean up tracer.so and any other build directories;
-            #     leave distribute for those that want to build themselves
+            print('Cleaning up coverage.py build ...')
+            shutil.rmtree('build')
+            os.unlink(os.path.join('coverage', 'tracer.so'))
 
     def generate_coveragepy_command(self, command, *args):
         exclude = '{},{}'.format(os.path.join('Lib', 'test', '*'),
@@ -304,7 +306,6 @@
         documentation."""
         super().create()
         with change_cwd(os.path.join(self.directory, 'Doc')):
-            # XXX Windows?
             subprocess.check_call(['make', 'checkout'])
 
     def build(self):
@@ -321,6 +322,7 @@
 
 
 if __name__ == '__main__':
+    # XXX CLI: create, build, list
     all_providers = (CPython, Devguide, PEPs, CoveragePy, Mercurial,
                      VisualCPPExpress)
     print(__doc__)

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

From python-checkins at python.org  Thu Nov 15 21:58:52 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 15 Nov 2012 21:58:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316469=3A_Fraction?=
 =?utf-8?b?KGZsb2F0KCduYW4nKSkgYW5kIEZyYWN0aW9uKGZsb2F0KCdpbmYnKSkgbm93?=
 =?utf-8?q?_raise?=
Message-ID: <3Y2ZgJ68bpzRlk@mail.python.org>

http://hg.python.org/cpython/rev/a2b54b6d9759
changeset:   80446:a2b54b6d9759
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Nov 15 20:58:40 2012 +0000
summary:
  Issue #16469: Fraction(float('nan')) and Fraction(float('inf')) now raise ValueError and OverflowError (resp.), not TypeError.

files:
  Lib/fractions.py           |  14 +++++++----
  Lib/test/test_fractions.py |  32 ++++++++++++++-----------
  Misc/NEWS                  |   4 +++
  3 files changed, 31 insertions(+), 19 deletions(-)


diff --git a/Lib/fractions.py b/Lib/fractions.py
--- a/Lib/fractions.py
+++ b/Lib/fractions.py
@@ -182,8 +182,10 @@
         elif not isinstance(f, float):
             raise TypeError("%s.from_float() only takes floats, not %r (%s)" %
                             (cls.__name__, f, type(f).__name__))
-        if math.isnan(f) or math.isinf(f):
-            raise TypeError("Cannot convert %r to %s." % (f, cls.__name__))
+        if math.isnan(f):
+            raise ValueError("Cannot convert %r to %s." % (f, cls.__name__))
+        if math.isinf(f):
+            raise OverflowError("Cannot convert %r to %s." % (f, cls.__name__))
         return cls(*f.as_integer_ratio())
 
     @classmethod
@@ -196,9 +198,11 @@
             raise TypeError(
                 "%s.from_decimal() only takes Decimals, not %r (%s)" %
                 (cls.__name__, dec, type(dec).__name__))
-        if not dec.is_finite():
-            # Catches infinities and nans.
-            raise TypeError("Cannot convert %s to %s." % (dec, cls.__name__))
+        if dec.is_infinite():
+            raise OverflowError(
+                "Cannot convert %s to %s." % (dec, cls.__name__))
+        if dec.is_nan():
+            raise ValueError("Cannot convert %s to %s." % (dec, cls.__name__))
         sign, digits, exp = dec.as_tuple()
         digits = int(''.join(map(str, digits)))
         if sign:
diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py
--- a/Lib/test/test_fractions.py
+++ b/Lib/test/test_fractions.py
@@ -146,9 +146,10 @@
         self.assertEqual((0, 1), _components(F(-0.0)))
         self.assertEqual((3602879701896397, 36028797018963968),
                          _components(F(0.1)))
-        self.assertRaises(TypeError, F, float('nan'))
-        self.assertRaises(TypeError, F, float('inf'))
-        self.assertRaises(TypeError, F, float('-inf'))
+        # bug 16469: error types should be consistent with float -> int
+        self.assertRaises(ValueError, F, float('nan'))
+        self.assertRaises(OverflowError, F, float('inf'))
+        self.assertRaises(OverflowError, F, float('-inf'))
 
     def testInitFromDecimal(self):
         self.assertEqual((11, 10),
@@ -157,10 +158,11 @@
                          _components(F(Decimal('3.5e-2'))))
         self.assertEqual((0, 1),
                          _components(F(Decimal('.000e20'))))
-        self.assertRaises(TypeError, F, Decimal('nan'))
-        self.assertRaises(TypeError, F, Decimal('snan'))
-        self.assertRaises(TypeError, F, Decimal('inf'))
-        self.assertRaises(TypeError, F, Decimal('-inf'))
+        # bug 16469: error types should be consistent with decimal -> int
+        self.assertRaises(ValueError, F, Decimal('nan'))
+        self.assertRaises(ValueError, F, Decimal('snan'))
+        self.assertRaises(OverflowError, F, Decimal('inf'))
+        self.assertRaises(OverflowError, F, Decimal('-inf'))
 
     def testFromString(self):
         self.assertEqual((5, 1), _components(F("5")))
@@ -248,14 +250,15 @@
 
         inf = 1e1000
         nan = inf - inf
+        # bug 16469: error types should be consistent with float -> int
         self.assertRaisesMessage(
-            TypeError, "Cannot convert inf to Fraction.",
+            OverflowError, "Cannot convert inf to Fraction.",
             F.from_float, inf)
         self.assertRaisesMessage(
-            TypeError, "Cannot convert -inf to Fraction.",
+            OverflowError, "Cannot convert -inf to Fraction.",
             F.from_float, -inf)
         self.assertRaisesMessage(
-            TypeError, "Cannot convert nan to Fraction.",
+            ValueError, "Cannot convert nan to Fraction.",
             F.from_float, nan)
 
     def testFromDecimal(self):
@@ -268,17 +271,18 @@
         self.assertEqual(1 - F(1, 10**30),
                          F.from_decimal(Decimal("0." + "9" * 30)))
 
+        # bug 16469: error types should be consistent with decimal -> int
         self.assertRaisesMessage(
-            TypeError, "Cannot convert Infinity to Fraction.",
+            OverflowError, "Cannot convert Infinity to Fraction.",
             F.from_decimal, Decimal("inf"))
         self.assertRaisesMessage(
-            TypeError, "Cannot convert -Infinity to Fraction.",
+            OverflowError, "Cannot convert -Infinity to Fraction.",
             F.from_decimal, Decimal("-inf"))
         self.assertRaisesMessage(
-            TypeError, "Cannot convert NaN to Fraction.",
+            ValueError, "Cannot convert NaN to Fraction.",
             F.from_decimal, Decimal("nan"))
         self.assertRaisesMessage(
-            TypeError, "Cannot convert sNaN to Fraction.",
+            ValueError, "Cannot convert sNaN to Fraction.",
             F.from_decimal, Decimal("snan"))
 
     def testLimitDenominator(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,10 @@
 Library
 -------
 
+- Issue #16469: Fix exceptions from float -> Fraction and Decimal -> Fraction
+  conversions for special values to be consistent with those for float -> int
+  and Decimal -> int.  Patch by Alexey Kachayev.
+
 - Issue #16481: multiprocessing no longer leaks process handles on Windows.
 
 - Issue #12428: Add a pure Python implementation of functools.partial().

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

From python-checkins at python.org  Thu Nov 15 22:16:56 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 22:16:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_the_Vim_syntax_file?=
	=?utf-8?q?s=2E?=
Message-ID: <3Y2b4865pDzRlx@mail.python.org>

http://hg.python.org/cpython/rev/7e37a6c76e36
changeset:   80447:7e37a6c76e36
parent:      80445:cb612c5f30cb
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 16:10:16 2012 -0500
summary:
  Remove the Vim syntax files.

They had become extremely stale (the script to generate the file was
Python 2 compatible!). Plus the community took the work and made
improvements that are available on www.vim.org.

If you want to update Vim's runtime files to the latest available,
follow the instructions at http://www.vim.org/runtime.php .

files:
  Misc/Vim/python.vim     |  148 ------------------
  Misc/Vim/syntax_test.py |   62 -------
  Misc/Vim/vim_syntax.py  |  229 ----------------------------
  Misc/Vim/vimrc          |   87 ----------
  4 files changed, 0 insertions(+), 526 deletions(-)


diff --git a/Misc/Vim/python.vim b/Misc/Vim/python.vim
deleted file mode 100644
--- a/Misc/Vim/python.vim
+++ /dev/null
@@ -1,148 +0,0 @@
-" Auto-generated Vim syntax file for Python (trunk: r60376M).
-"
-" To use: copy or symlink to ~/.vim/syntax/python.vim
-
-
-if exists("b:current_syntax")
-  finish
-endif
-
-if exists("python_highlight_all")
-  let python_highlight_numbers = 1
-  let python_highlight_builtins = 1
-  let python_highlight_exceptions = 1
-  let python_highlight_space_errors = 1
-endif
-
-syn keyword pythonStatement    as assert break continue del except exec finally
-syn keyword pythonStatement    global lambda pass print raise return try with
-syn keyword pythonStatement    yield
-
-syn keyword pythonStatement    def class nextgroup=pythonFunction skipwhite
-
-syn match pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" contained
-
-syn keyword pythonRepeat    for while
-
-syn keyword pythonConditional    if elif else
-
-syn keyword pythonOperator    and in is not or
-
-syn keyword pythonPreCondit    import from
-
-syn match pythonComment    "#.*$" contains=pythonTodo
-
-syn keyword pythonTodo    TODO FIXME XXX contained
-
-syn region pythonString    matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape
-syn region pythonString    matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape
-syn region pythonString    matchgroup=Normal start=+[uU]\="""+ end=+"""+  contains=pythonEscape
-syn region pythonString    matchgroup=Normal start=+[uU]\='''+ end=+'''+  contains=pythonEscape
-syn region pythonString    matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ skip=+\\\\\|\\'+ 
-syn region pythonString    matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ skip=+\\\\\|\\"+ 
-syn region pythonString    matchgroup=Normal start=+[uU]\=[rR]"""+ end=+"""+  
-syn region pythonString    matchgroup=Normal start=+[uU]\=[rR]'''+ end=+'''+  
-
-syn match pythonEscape    +\\[abfnrtv\'"\\]+ contained
-syn match pythonEscape    "\\\o\{1,3}" contained
-syn match pythonEscape    "\\x\x\{2}" contained
-syn match pythonEscape    "\(\\u\x\{4}\|\\U\x\{8}\)" contained
-
-syn match pythonEscape    "\\$"
-
-
-if exists("python_highlight_numbers")
-  syn match pythonNumber    "\<0x\x\+[Ll]\=\>"
-  syn match pythonNumber    "\<\d\+[LljJ]\=\>"
-  syn match pythonNumber    "\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>"
-  syn match pythonNumber    "\<\d\+\.\([eE][+-]\=\d\+\)\=[jJ]\=\>"
-  syn match pythonNumber    "\<\d\+\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>"
-
-endif
-
-
-if exists("python_highlight_builtins")
-  syn keyword pythonBuiltin    Ellipsis False None NotImplemented True __debug__
-  syn keyword pythonBuiltin    __import__ abs all any bool
-  syn keyword pythonBuiltin    buffer callable chr classmethod cmp
-  syn keyword pythonBuiltin    complex copyright credits delattr dict
-  syn keyword pythonBuiltin    dir divmod enumerate eval exec exit
-  syn keyword pythonBuiltin    filter float frozenset getattr globals hasattr
-  syn keyword pythonBuiltin    hash help hex id int isinstance
-  syn keyword pythonBuiltin    issubclass iter len license list locals map
-  syn keyword pythonBuiltin    max min object oct open ord pow property quit
-  syn keyword pythonBuiltin    range reload repr reversed round
-  syn keyword pythonBuiltin    set setattr slice sorted staticmethod str sum
-  syn keyword pythonBuiltin    super trunc tuple type unicode vars 
-  syn keyword pythonBuiltin    zip
-
-endif
-
-
-if exists("python_highlight_exceptions")
-  syn keyword pythonException    ArithmeticError AssertionError AttributeError
-  syn keyword pythonException    BaseException DeprecationWarning EOFError
-  syn keyword pythonException    EnvironmentError Exception FloatingPointError
-  syn keyword pythonException    FutureWarning GeneratorExit IOError ImportError
-  syn keyword pythonException    ImportWarning IndentationError IndexError
-  syn keyword pythonException    KeyError KeyboardInterrupt LookupError
-  syn keyword pythonException    MemoryError NameError NotImplementedError
-  syn keyword pythonException    OSError OverflowError PendingDeprecationWarning
-  syn keyword pythonException    ReferenceError RuntimeError RuntimeWarning
-  syn keyword pythonException    StopIteration SyntaxError
-  syn keyword pythonException    SyntaxWarning SystemError SystemExit TabError
-  syn keyword pythonException    TypeError UnboundLocalError UnicodeDecodeError
-  syn keyword pythonException    UnicodeEncodeError UnicodeError
-  syn keyword pythonException    UnicodeTranslateError UnicodeWarning
-  syn keyword pythonException    UserWarning ValueError Warning
-  syn keyword pythonException    ZeroDivisionError
-
-endif
-
-
-if exists("python_highlight_space_errors")
-  syn match pythonSpaceError    display excludenl "\S\s\+$"ms=s+1
-  syn match pythonSpaceError    display " \+\t"
-  syn match pythonSpaceError    display "\t\+ "
-
-endif
-
-
-  hi def link pythonStatement Statement
-  hi def link pythonStatement Statement
-  hi def link pythonFunction Function
-  hi def link pythonRepeat Repeat
-  hi def link pythonConditional Conditional
-  hi def link pythonOperator Operator
-  hi def link pythonPreCondit PreCondit
-  hi def link pythonComment Comment
-  hi def link pythonTodo Todo
-  hi def link pythonString String
-  hi def link pythonEscape Special
-  hi def link pythonEscape Special
-
-  if exists("python_highlight_numbers")
-    hi def link pythonNumber Number
-  endif
-
-  if exists("python_highlight_builtins")
-    hi def link pythonBuiltin Function
-  endif
-
-  if exists("python_highlight_exceptions")
-    hi def link pythonException Exception
-  endif
-
-  if exists("python_highlight_space_errors")
-    hi def link pythonSpaceError Error
-  endif
-
-
-" Uncomment the 'minlines' statement line and comment out the 'maxlines'
-" statement line; changes behaviour to look at least 2000 lines previously for
-" syntax matches instead of at most 200 lines
-syn sync match pythonSync grouphere NONE "):$"
-syn sync maxlines=200
-"syn sync minlines=2000
-
-let b:current_syntax = "python"
diff --git a/Misc/Vim/syntax_test.py b/Misc/Vim/syntax_test.py
deleted file mode 100644
--- a/Misc/Vim/syntax_test.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""Test file for syntax highlighting of editors.
-
-Meant to cover a wide range of different types of statements and expressions.
-Not necessarily sensical or comprehensive (assume that if one exception is
-highlighted that all are, for instance).
-
-Extraneous trailing whitespace can't be tested because of svn pre-commit hook
-checks for such things.
-
-"""
-# Comment
-# OPTIONAL: XXX catch your attention
-
-# Statements
-from __future__ import with_statement  # Import
-from sys import path as thing
-assert True # keyword
-def foo():  # function definition
-    return []
-class Bar(object):  # Class definition
-    def __enter__(self):
-        pass
-    def __exit__(self, *args):
-        pass
-foo()  # UNCOLOURED: function call
-while False:  # 'while'
-    continue
-for x in foo():  # 'for'
-    break
-with Bar() as stuff:
-    pass
-if False: pass  # 'if'
-elif False: pass
-else: pass
-
-# Constants
-'single-quote', u'unicode' # Strings of all kinds; prefixes not highlighted
-"double-quote"
-"""triple double-quote"""
-'''triple single-quote'''
-r'raw'
-ur'unicode raw'
-'escape\n'
-'\04'  # octal
-'\xFF' # hex
-'\u1111' # unicode character
-1  # Integral
-1L
-1.0  # Float
-.1
-1+2j  # Complex
-
-# Expressions
-1 and 2 or 3  # Boolean operators
-2 < 3  # UNCOLOURED: comparison operators
-spam = 42  # UNCOLOURED: assignment
-2 + 3  # UNCOLOURED: number operators
-[]  # UNCOLOURED: list
-{}  # UNCOLOURED: dict
-(1,)  # UNCOLOURED: tuple
-all  # Built-in functions
-GeneratorExit  # Exceptions
diff --git a/Misc/Vim/vim_syntax.py b/Misc/Vim/vim_syntax.py
deleted file mode 100644
--- a/Misc/Vim/vim_syntax.py
+++ /dev/null
@@ -1,229 +0,0 @@
-from __future__ import with_statement
-# XXX(nnorwitz): what versions of python is this file supposed to work with?
-# It uses the old print statement not in py3k.
-
-import keyword
-import exceptions
-import builtins
-from string import Template
-from sys import subversion
-
-comment_header = '''" Auto-generated Vim syntax file for Python (%s: r%s).
-"
-" To use: copy or symlink to ~/.vim/syntax/python.vim'''
-
-statement_header = """
-if exists("b:current_syntax")
-  finish
-endif"""
-
-statement_footer = '''
-" Uncomment the 'minlines' statement line and comment out the 'maxlines'
-" statement line; changes behaviour to look at least 2000 lines previously for
-" syntax matches instead of at most 200 lines
-syn sync match pythonSync grouphere NONE "):$"
-syn sync maxlines=200
-"syn sync minlines=2000
-
-let b:current_syntax = "python"'''
-
-looping = ('for', 'while')
-conditionals = ('if', 'elif', 'else')
-boolean_ops = ('and', 'in', 'is', 'not', 'or')
-import_stmts = ('import', 'from')
-object_defs = ('def', 'class')
-
-exception_names = sorted(exc for exc in dir(exceptions)
-                                if not exc.startswith('__'))
-
-# Need to include functions that start with '__' (e.g., __import__), but
-# nothing that comes with modules (e.g., __name__), so just exclude anything in
-# the 'exceptions' module since we want to ignore exceptions *and* what any
-# module would have
-builtin_names = sorted(builtin for builtin in dir(builtins)
-                            if builtin not in dir(exceptions))
-
-escapes = (r'+\\[abfnrtv\'"\\]+', r'"\\\o\{1,3}"', r'"\\x\x\{2}"',
-            r'"\(\\u\x\{4}\|\\U\x\{8}\)"', r'"\\$"')
-
-todos = ("TODO", "FIXME", "XXX")
-
-# XXX codify?
-numbers = (r'"\<0x\x\+[Ll]\=\>"', r'"\<\d\+[LljJ]\=\>"',
-            '"\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>"',
-            '"\<\d\+\.\([eE][+-]\=\d\+\)\=[jJ]\=\>"',
-            '"\<\d\+\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>"')
-
-contained = lambda x: "%s contained" % x
-
-def str_regexes():
-    """Generator to yield various combinations of strings regexes"""
-    regex_template = Template('matchgroup=Normal ' +
-                                'start=+[uU]\=${raw}${sep}+ ' +
-                                'end=+${sep}+ ' +
-                                '${skip} ' +
-                                '${contains}')
-    skip_regex = Template(r'skip=+\\\\\|\\${sep}+')
-    for raw in ('', '[rR]'):
-        for separator in ("'", '"', '"""', "'''"):
-            if len(separator) == 1:
-                skip = skip_regex.substitute(sep=separator)
-            else:
-                skip = ''
-            contains = 'contains=pythonEscape' if not raw else ''
-            yield regex_template.substitute(raw=raw, sep=separator, skip=skip,
-                                            contains = contains)
-
-space_errors = (r'excludenl "\S\s\+$"ms=s+1', r'" \+\t"', r'"\t\+ "')
-
-statements = (
-                ('',
-                    # XXX Might need to change pythonStatement since have
-                    # specific Repeat, Conditional, Operator, etc. for 'while',
-                    # etc.
-                    [("Statement", "pythonStatement", "keyword",
-                        (kw for kw in keyword.kwlist
-                            if kw not in (looping + conditionals + boolean_ops +
-                                        import_stmts + object_defs))
-                      ),
-                     ("Statement", "pythonStatement", "keyword",
-                         (' '.join(object_defs) +
-                             ' nextgroup=pythonFunction skipwhite')),
-                     ("Function","pythonFunction", "match",
-                         contained('"[a-zA-Z_][a-zA-Z0-9_]*"')),
-                     ("Repeat", "pythonRepeat", "keyword", looping),
-                     ("Conditional", "pythonConditional", "keyword",
-                         conditionals),
-                     ("Operator", "pythonOperator", "keyword", boolean_ops),
-                     ("PreCondit", "pythonPreCondit", "keyword", import_stmts),
-                     ("Comment", "pythonComment", "match",
-                         '"#.*$" contains=pythonTodo'),
-                     ("Todo", "pythonTodo", "keyword",
-                         contained(' '.join(todos))),
-                     ("String", "pythonString", "region", str_regexes()),
-                     ("Special", "pythonEscape", "match",
-                         (contained(esc) for esc in escapes
-                             if not '$' in esc)),
-                     ("Special", "pythonEscape", "match", r'"\\$"'),
-                    ]
-                ),
-                ("python_highlight_numbers",
-                    [("Number", "pythonNumber", "match", numbers)]
-                ),
-                ("python_highlight_builtins",
-                    [("Function", "pythonBuiltin", "keyword", builtin_names)]
-                ),
-                ("python_highlight_exceptions",
-                    [("Exception", "pythonException", "keyword",
-                        exception_names)]
-                ),
-                ("python_highlight_space_errors",
-                    [("Error", "pythonSpaceError", "match",
-                        ("display " + err for err in space_errors))]
-                )
-             )
-
-def syn_prefix(type_, kind):
-    return 'syn %s %s    ' % (type_, kind)
-
-def fill_stmt(iterable, fill_len):
-    """Yield a string that fills at most fill_len characters with strings
-    returned by 'iterable' and separated by a space"""
-    # Deal with trailing char to handle ' '.join() calculation
-    fill_len += 1
-    overflow = None
-    it = iter(iterable)
-    while True:
-        buffer_ = []
-        total_len = 0
-        if overflow:
-            buffer_.append(overflow)
-            total_len += len(overflow) + 1
-            overflow = None
-        while total_len < fill_len:
-            try:
-                new_item = next(it)
-                buffer_.append(new_item)
-                total_len += len(new_item) + 1
-            except StopIteration:
-                if buffer_:
-                    break
-                if overflow:
-                    yield overflow
-                return
-        if total_len > fill_len:
-            overflow = buffer_.pop()
-            total_len -= len(overflow) - 1
-        ret = ' '.join(buffer_)
-        assert len(ret) <= fill_len
-        yield ret
-
-FILL = 80
-
-def main(file_path):
-    with open(file_path, 'w') as FILE:
-        # Comment for file
-        print>>FILE, comment_header % subversion[1:]
-        print>>FILE, ''
-        # Statements at start of file
-        print>>FILE, statement_header
-        print>>FILE, ''
-        # Generate case for python_highlight_all
-        print>>FILE, 'if exists("python_highlight_all")'
-        for statement_var, statement_parts in statements:
-            if statement_var:
-                print>>FILE, '  let %s = 1' % statement_var
-        else:
-            print>>FILE, 'endif'
-            print>>FILE, ''
-        # Generate Python groups
-        for statement_var, statement_parts in statements:
-            if statement_var:
-                print>>FILE, 'if exists("%s")' % statement_var
-                indent = '  '
-            else:
-                indent = ''
-            for colour_group, group, type_, arguments in statement_parts:
-                if not isinstance(arguments, basestring):
-                    prefix = syn_prefix(type_, group)
-                    if type_ == 'keyword':
-                        stmt_iter = fill_stmt(arguments,
-                                            FILL - len(prefix) - len(indent))
-                        try:
-                            while True:
-                                print>>FILE, indent + prefix + next(stmt_iter)
-                        except StopIteration:
-                            print>>FILE, ''
-                    else:
-                        for argument in arguments:
-                            print>>FILE, indent + prefix + argument
-                        else:
-                            print>>FILE, ''
-
-                else:
-                    print>>FILE, indent + syn_prefix(type_, group) + arguments
-                    print>>FILE, ''
-            else:
-                if statement_var:
-                    print>>FILE, 'endif'
-                    print>>FILE, ''
-            print>>FILE, ''
-        # Associating Python group with Vim colour group
-        for statement_var, statement_parts in statements:
-            if statement_var:
-                print>>FILE, '  if exists("%s")' % statement_var
-                indent = '    '
-            else:
-                indent = '  '
-            for colour_group, group, type_, arguments in statement_parts:
-                print>>FILE, (indent + "hi def link %s %s" %
-                                (group, colour_group))
-            else:
-                if statement_var:
-                    print>>FILE, '  endif'
-                print>>FILE, ''
-        # Statements at the end of the file
-        print>>FILE, statement_footer
-
-if __name__ == '__main__':
-    main("python.vim")
diff --git a/Misc/Vim/vimrc b/Misc/Vim/vimrc
deleted file mode 100644
--- a/Misc/Vim/vimrc
+++ /dev/null
@@ -1,87 +0,0 @@
-" vimrc file for following the coding standards specified in PEP 7 & 8.
-"
-" To use this file, source it in your own personal .vimrc file (``source
-" <filename>``) or, if you don't have a .vimrc file, you can just symlink to it
-" (``ln -s <this file> ~/.vimrc``).  All options are protected by autocmds
-" (read below for an explanation of the command) so blind sourcing of this file
-" is safe and will not affect your settings for non-Python or non-C files.
-"
-"
-" All setting are protected by 'au' ('autocmd') statements.  Only files ending
-" in .py or .pyw will trigger the Python settings while files ending in *.c or
-" *.h will trigger the C settings.  This makes the file "safe" in terms of only
-" adjusting settings for Python and C files.
-"
-" Only basic settings needed to enforce the style guidelines are set.
-" Some suggested options are listed but commented out at the end of this file.
-
-" Number of spaces that a pre-existing tab is equal to.
-" For the amount of space used for a new tab use shiftwidth.
-au BufRead,BufNewFile *py,*pyw,*.c,*.h set tabstop=8
-
-" What to use for an indent.
-" This will affect Ctrl-T and 'autoindent'.
-" Python: 4 spaces
-" C: tabs (pre-existing files) or 4 spaces (new files)
-au BufRead,BufNewFile *.py,*pyw set shiftwidth=4
-au BufRead,BufNewFile *.py,*.pyw set expandtab
-fu Select_c_style()
-    if search('^\t', 'n', 150)
-        set shiftwidth=8
-        set noexpandtab
-    el 
-        set shiftwidth=4
-        set expandtab
-    en
-endf
-au BufRead,BufNewFile *.c,*.h call Select_c_style()
-au BufRead,BufNewFile Makefile* set noexpandtab
-
-" Use the below highlight group when displaying bad whitespace is desired.
-highlight BadWhitespace ctermbg=red guibg=red
-
-" Display tabs at the beginning of a line in Python mode as bad.
-au BufRead,BufNewFile *.py,*.pyw match BadWhitespace /^\t\+/
-" Make trailing whitespace be flagged as bad.
-au BufRead,BufNewFile *.py,*.pyw,*.c,*.h,*.rst match BadWhitespace /\s\+$/
-
-" Wrap text after a certain number of characters
-" Python: 79 
-" C: 79
-au BufRead,BufNewFile *.py,*.pyw,*.c,*.h set textwidth=79
-
-" Turn off settings in 'formatoptions' relating to comment formatting.
-" - c : do not automatically insert the comment leader when wrapping based on
-"    'textwidth'
-" - o : do not insert the comment leader when using 'o' or 'O' from command mode
-" - r : do not insert the comment leader when hitting <Enter> in insert mode
-" Python: not needed
-" C: prevents insertion of '*' at the beginning of every line in a comment
-au BufRead,BufNewFile *.c,*.h set formatoptions-=c formatoptions-=o formatoptions-=r
-
-" Use UNIX (\n) line endings.
-" Only used for new files so as to not force existing files to change their
-" line endings.
-" Python: yes
-" C: yes
-au BufNewFile *.py,*.pyw,*.c,*.h set fileformat=unix
-
-
-" ----------------------------------------------------------------------------
-" The following section contains suggested settings.  While in no way required
-" to meet coding standards, they are helpful.
-
-" Set the default file encoding to UTF-8: ``set encoding=utf-8``
-
-" Puts a marker at the beginning of the file to differentiate between UTF and
-" UCS encoding (WARNING: can trick shells into thinking a text file is actually
-" a binary file when executing the text file): ``set bomb``
-
-" For full syntax highlighting:
-"``let python_highlight_all=1``
-"``syntax on``
-
-" Automatically indent based on file type: ``filetype indent on``
-" Keep indentation level from previous line: ``set autoindent``
-
-" Folding based on indentation: ``set foldmethod=indent``

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

From python-checkins at python.org  Thu Nov 15 22:16:58 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 22:16:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_the_TextMate_bundle?=
	=?utf-8?q?=2E?=
Message-ID: <3Y2b4B2QDFzRlx@mail.python.org>

http://hg.python.org/cpython/rev/901002834a68
changeset:   80448:901002834a68
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 16:12:19 2012 -0500
summary:
  Remove the TextMate bundle.

It had not been updated since May 2008 (6 months before Python 3 was
released!).

This now removes any special editor support by python-dev, alleviating
those burdens.

files:
  Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand        |  64 ----------
  Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand                      |  23 ---
  Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand                           |  25 ---
  Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand                     |  20 ---
  Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand                       |  32 -----
  Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand                        |  23 ---
  Misc/TextMate/Python-Dev.tmbundle/Snippets/2 to 3 - Module Deletion (docs).tmSnippet |  16 --
  Misc/TextMate/Python-Dev.tmbundle/info.plist                                         |  37 -----
  8 files changed, 0 insertions(+), 240 deletions(-)


diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Commands/2 to 3 - Module Deletion.tmCommand	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/python
-"""Generate code to warn about a module's removal in Python 3.0.
-
-XXX Not supported:
-- Module's in a package do not have their full name generated.
-- Package's __init__ module; should detect and use the package's name instead.
-
-"""
-py_template = """from warnings import warnpy3k
-warnpy3k("the ${1:%s} module has been removed in Python 3.0", stacklevel=2)
-del warnpy3k$0"""
-
-c_template = """
-if (PyErr_WarnPy3k("the ${1:%s} module has been removed in "
-                   "Python 3.0", 2) &lt; 0)
-    return;$0"""
-
-
-import imp
-import os
-
-file_name = os.path.split(os.environ['TM_FILEPATH'])[1]
-
-py_suffixes = reversed(sorted((suffix[0] for suffix in imp.get_suffixes() if suffix[2] == imp.PY_SOURCE), key=len))
-c_suffixes = reversed(sorted((os.path.splitext(suffix[0])[0] + '.c'
-                                for suffix in imp.get_suffixes() if suffix[2] == imp.C_EXTENSION), key=len))
-
-pairings = ((py_suffixes, py_template), (c_suffixes, c_template))
-
-def create_template(suffixes, template):
-    for suffix in suffixes:
-        if not file_name.endswith(suffix):
-            continue
-        module_name = file_name[:-len(suffix)]
-        return template % module_name
-    else:
-        return None
-
-for template in (create_template(*pair) for pair in pairings):
-    if not template:
-        continue
-    print template,
-    break
-else:
-    print 'XXX Could not generate code.'</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>2 to 3 - Module Deletion</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>tabTrigger</key>
-	<string>2to3moddel</string>
-	<key>uuid</key>
-	<string>9519C22B-6AB8-41A1-94F6-079E0B45C147</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Commands/Build Docs.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string># XXX Leopard-specific unless have easy way to specific alternative Python executable.
-
-cd $TM_PROJECT_DIRECTORY/Doc
-make html 2&gt;&amp;1 | pre
-
-rescan_project</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>Build Docs</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>uuid</key>
-	<string>6EF151E5-7149-4F82-8796-0CC40FE589FA</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Commands/Build.tmCommand
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string># XXX TODO
-# - Highlight any compiler warnings for Python code.
-# - Point out if compile failed.
-
-cd $TM_PROJECT_DIRECTORY
-make -s -j2 2&gt;&amp;1 | pre
-
-rescan_project</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>Build Python</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>uuid</key>
-	<string>B545BB1B-A8E1-426C-B50A-426E78B96D38</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Commands/Go to Issue.tmCommand	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>open "http://bugs.python.org/issue$(cat)"</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Go to Issue</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>uuid</key>
-	<string>FD25A8DC-22DC-4ED4-B222-B943C8A9117D</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Commands/Open Docs.tmCommand	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string># Search order:
-#  - Current project.
-#  - TM_PYTHONDEV_DOCS.
-#  - Online docs in development.
-
-html_index=$TM_PROJECT_DIRECTORY/Doc/build/html/index.html
-if [[ -f $html_index ]]; then
-	open $html_index
-elif [[ $TM_PYTHONDEV_DOCS ]]; then
-	open $TM_PYTHONDEV_DOCS
-else
-	open http://docs.python.org/dev/
-fi</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>@H</string>
-	<key>name</key>
-	<string>Open Docs</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>uuid</key>
-	<string>BF336FFF-E14D-4BF1-A156-71CF768AC034</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand b/Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Commands/Open PEP.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string># XXX Worth supporting using a local copy?
-
-# Dumb luck that an unrecognized number leads to a 0 being used.
-open `printf "http://www.python.org/dev/peps/pep-%04d" $(cat)`</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Open PEP</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>uuid</key>
-	<string>EDBB037F-AAE3-4512-863F-D9AA82C9E51E</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/Snippets/2 to 3 - Module Deletion (docs).tmSnippet b/Misc/TextMate/Python-Dev.tmbundle/Snippets/2 to 3 - Module Deletion (docs).tmSnippet
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/Snippets/2 to 3 - Module Deletion (docs).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>.. deprecated:: 2.6
-   The :mod:\`${1}\` module has been deprecated for removal in Python 3.0.
-${0}</string>
-	<key>name</key>
-	<string>2 to 3 - Module Deletion (docs)</string>
-	<key>tabTrigger</key>
-	<string>2to3docdel</string>
-	<key>uuid</key>
-	<string>0568410D-EAF1-4AF3-B6DE-8AF133A91821</string>
-</dict>
-</plist>
diff --git a/Misc/TextMate/Python-Dev.tmbundle/info.plist b/Misc/TextMate/Python-Dev.tmbundle/info.plist
deleted file mode 100644
--- a/Misc/TextMate/Python-Dev.tmbundle/info.plist
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>mainMenu</key>
-	<dict>
-		<key>items</key>
-		<array>
-			<string>9519C22B-6AB8-41A1-94F6-079E0B45C147</string>
-			<string>0568410D-EAF1-4AF3-B6DE-8AF133A91821</string>
-			<string>------------------------------------</string>
-			<string>B545BB1B-A8E1-426C-B50A-426E78B96D38</string>
-			<string>6EF151E5-7149-4F82-8796-0CC40FE589FA</string>
-			<string>------------------------------------</string>
-			<string>BF336FFF-E14D-4BF1-A156-71CF768AC034</string>
-			<string>FD25A8DC-22DC-4ED4-B222-B943C8A9117D</string>
-			<string>EDBB037F-AAE3-4512-863F-D9AA82C9E51E</string>
-		</array>
-		<key>submenus</key>
-		<dict/>
-	</dict>
-	<key>name</key>
-	<string>Python-Dev</string>
-	<key>ordering</key>
-	<array>
-		<string>9519C22B-6AB8-41A1-94F6-079E0B45C147</string>
-		<string>0568410D-EAF1-4AF3-B6DE-8AF133A91821</string>
-		<string>B545BB1B-A8E1-426C-B50A-426E78B96D38</string>
-		<string>6EF151E5-7149-4F82-8796-0CC40FE589FA</string>
-		<string>FD25A8DC-22DC-4ED4-B222-B943C8A9117D</string>
-		<string>BF336FFF-E14D-4BF1-A156-71CF768AC034</string>
-		<string>EDBB037F-AAE3-4512-863F-D9AA82C9E51E</string>
-	</array>
-	<key>uuid</key>
-	<string>A932ECD1-D43A-4F57-B7FB-A1CEC3B65D20</string>
-</dict>
-</plist>

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

From python-checkins at python.org  Thu Nov 15 22:16:59 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 22:16:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3Y2b4C5yPvzRmC@mail.python.org>

http://hg.python.org/cpython/rev/c7bd9633cb8b
changeset:   80449:c7bd9633cb8b
parent:      80448:901002834a68
parent:      80446:a2b54b6d9759
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 16:13:00 2012 -0500
summary:
  merge

files:
  Lib/fractions.py           |  14 +++++++----
  Lib/test/test_fractions.py |  32 ++++++++++++++-----------
  Misc/NEWS                  |   4 +++
  3 files changed, 31 insertions(+), 19 deletions(-)


diff --git a/Lib/fractions.py b/Lib/fractions.py
--- a/Lib/fractions.py
+++ b/Lib/fractions.py
@@ -182,8 +182,10 @@
         elif not isinstance(f, float):
             raise TypeError("%s.from_float() only takes floats, not %r (%s)" %
                             (cls.__name__, f, type(f).__name__))
-        if math.isnan(f) or math.isinf(f):
-            raise TypeError("Cannot convert %r to %s." % (f, cls.__name__))
+        if math.isnan(f):
+            raise ValueError("Cannot convert %r to %s." % (f, cls.__name__))
+        if math.isinf(f):
+            raise OverflowError("Cannot convert %r to %s." % (f, cls.__name__))
         return cls(*f.as_integer_ratio())
 
     @classmethod
@@ -196,9 +198,11 @@
             raise TypeError(
                 "%s.from_decimal() only takes Decimals, not %r (%s)" %
                 (cls.__name__, dec, type(dec).__name__))
-        if not dec.is_finite():
-            # Catches infinities and nans.
-            raise TypeError("Cannot convert %s to %s." % (dec, cls.__name__))
+        if dec.is_infinite():
+            raise OverflowError(
+                "Cannot convert %s to %s." % (dec, cls.__name__))
+        if dec.is_nan():
+            raise ValueError("Cannot convert %s to %s." % (dec, cls.__name__))
         sign, digits, exp = dec.as_tuple()
         digits = int(''.join(map(str, digits)))
         if sign:
diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py
--- a/Lib/test/test_fractions.py
+++ b/Lib/test/test_fractions.py
@@ -146,9 +146,10 @@
         self.assertEqual((0, 1), _components(F(-0.0)))
         self.assertEqual((3602879701896397, 36028797018963968),
                          _components(F(0.1)))
-        self.assertRaises(TypeError, F, float('nan'))
-        self.assertRaises(TypeError, F, float('inf'))
-        self.assertRaises(TypeError, F, float('-inf'))
+        # bug 16469: error types should be consistent with float -> int
+        self.assertRaises(ValueError, F, float('nan'))
+        self.assertRaises(OverflowError, F, float('inf'))
+        self.assertRaises(OverflowError, F, float('-inf'))
 
     def testInitFromDecimal(self):
         self.assertEqual((11, 10),
@@ -157,10 +158,11 @@
                          _components(F(Decimal('3.5e-2'))))
         self.assertEqual((0, 1),
                          _components(F(Decimal('.000e20'))))
-        self.assertRaises(TypeError, F, Decimal('nan'))
-        self.assertRaises(TypeError, F, Decimal('snan'))
-        self.assertRaises(TypeError, F, Decimal('inf'))
-        self.assertRaises(TypeError, F, Decimal('-inf'))
+        # bug 16469: error types should be consistent with decimal -> int
+        self.assertRaises(ValueError, F, Decimal('nan'))
+        self.assertRaises(ValueError, F, Decimal('snan'))
+        self.assertRaises(OverflowError, F, Decimal('inf'))
+        self.assertRaises(OverflowError, F, Decimal('-inf'))
 
     def testFromString(self):
         self.assertEqual((5, 1), _components(F("5")))
@@ -248,14 +250,15 @@
 
         inf = 1e1000
         nan = inf - inf
+        # bug 16469: error types should be consistent with float -> int
         self.assertRaisesMessage(
-            TypeError, "Cannot convert inf to Fraction.",
+            OverflowError, "Cannot convert inf to Fraction.",
             F.from_float, inf)
         self.assertRaisesMessage(
-            TypeError, "Cannot convert -inf to Fraction.",
+            OverflowError, "Cannot convert -inf to Fraction.",
             F.from_float, -inf)
         self.assertRaisesMessage(
-            TypeError, "Cannot convert nan to Fraction.",
+            ValueError, "Cannot convert nan to Fraction.",
             F.from_float, nan)
 
     def testFromDecimal(self):
@@ -268,17 +271,18 @@
         self.assertEqual(1 - F(1, 10**30),
                          F.from_decimal(Decimal("0." + "9" * 30)))
 
+        # bug 16469: error types should be consistent with decimal -> int
         self.assertRaisesMessage(
-            TypeError, "Cannot convert Infinity to Fraction.",
+            OverflowError, "Cannot convert Infinity to Fraction.",
             F.from_decimal, Decimal("inf"))
         self.assertRaisesMessage(
-            TypeError, "Cannot convert -Infinity to Fraction.",
+            OverflowError, "Cannot convert -Infinity to Fraction.",
             F.from_decimal, Decimal("-inf"))
         self.assertRaisesMessage(
-            TypeError, "Cannot convert NaN to Fraction.",
+            ValueError, "Cannot convert NaN to Fraction.",
             F.from_decimal, Decimal("nan"))
         self.assertRaisesMessage(
-            TypeError, "Cannot convert sNaN to Fraction.",
+            ValueError, "Cannot convert sNaN to Fraction.",
             F.from_decimal, Decimal("snan"))
 
     def testLimitDenominator(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,10 @@
 Library
 -------
 
+- Issue #16469: Fix exceptions from float -> Fraction and Decimal -> Fraction
+  conversions for special values to be consistent with those for float -> int
+  and Decimal -> int.  Patch by Alexey Kachayev.
+
 - Issue #16481: multiprocessing no longer leaks process handles on Windows.
 
 - Issue #12428: Add a pure Python implementation of functools.partial().

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

From python-checkins at python.org  Thu Nov 15 22:17:01 2012
From: python-checkins at python.org (brett.cannon)
Date: Thu, 15 Nov 2012 22:17:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_NEWS_entries_for_the_r?=
 =?utf-8?q?emoval_of_Misc/Vim_and_Misc/TextMate=2E?=
Message-ID: <3Y2b4F1DYRzRmn@mail.python.org>

http://hg.python.org/cpython/rev/e36728b0dcdf
changeset:   80450:e36728b0dcdf
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 16:16:45 2012 -0500
summary:
  Add NEWS entries for the removal of Misc/Vim and Misc/TextMate.

Also merged two duplicate sections of Tools/Demos.

files:
  Misc/NEWS |  87 +++++++++++++++++++++---------------------
  1 files changed, 44 insertions(+), 43 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -370,55 +370,56 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a read-only
   source directory.  (Somewhat related to issue #9860.)
 
+Documentation
+-------------
+
+- Issue #16400: Update the description of which versions of a given package
+  PyPI displays.
+
+- Issue #15677: Document that zlib and gzip accept a compression level of 0 to
+  mean 'no compression'. Patch by Brian Brazil.
+
+- Issue #8040: added a version switcher to the documentation.  Patch by
+  Yury Selivanov.
+
+- Additional comments and some style changes in the concurrent.futures URL
+  retrieval example
+
+- Issue #16115: Improve subprocess.Popen() documentation around args, shell,
+  and executable arguments.
+
+- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument.  Done with
+  great native-speaker help from R. David Murray.
+
+- Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd
+  argument.
+
+- Issue #15979: Improve timeit 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
 -----------
 
+- Issue #9893: Removed the Misc/Vim directory.
+
+- Removed the Misc/TextMate directory.
+
+- Issue #16245: Add the Tools/scripts/parse_html5_entities.py script to parse
+  the list of HTML5 entities and update the html.entities.html5 dictionary.
+
+- Issue #15378: Fix Tools/unicode/comparecodecs.py.  Patch by Serhiy Storchaka.
+
 - Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py
   Patch by Serhiy Storchaka.
 
-Documentation
--------------
-
-- Issue #16400: Update the description of which versions of a given package
-  PyPI displays.
-
-- Issue #15677: Document that zlib and gzip accept a compression level of 0 to
-  mean 'no compression'. Patch by Brian Brazil.
-
-- Issue #8040: added a version switcher to the documentation.  Patch by
-  Yury Selivanov.
-
-- Additional comments and some style changes in the concurrent.futures URL
-  retrieval example
-
-- Issue #16115: Improve subprocess.Popen() documentation around args, shell,
-  and executable arguments.
-
-- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument.  Done with
-  great native-speaker help from R. David Murray.
-
-- Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd
-  argument.
-
-- Issue #15979: Improve timeit 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
------------
-
-- Issue #16245: Add the Tools/scripts/parse_html5_entities.py script to parse
-  the list of HTML5 entities and update the html.entities.html5 dictionary.
-
-- Issue #15378: Fix Tools/unicode/comparecodecs.py.  Patch by Serhiy Storchaka.
-
 
 What's New in Python 3.3.0?
 ===========================

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

From python-checkins at python.org  Fri Nov 16 01:53:21 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 16 Nov 2012 01:53:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Provide_more_clarificatio?=
 =?utf-8?q?n_on_running_tests_from_the_command-line=2E?=
Message-ID: <3Y2gss74V0zRhN@mail.python.org>

http://hg.python.org/devguide/rev/427bdf0cf72f
changeset:   567:427bdf0cf72f
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Thu Nov 15 16:52:11 2012 -0800
summary:
  Provide more clarification on running tests from the command-line.

This change is partly in response to the python-dev thread starting with
the following post (subject line "problems building python2.7"):

http://mail.python.org/pipermail/python-dev/2012-November/122623.html

files:
  index.rst    |  12 ++++++++----
  runtests.rst |   9 +++++----
  setup.rst    |   4 +++-
  3 files changed, 16 insertions(+), 9 deletions(-)


diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -46,10 +46,14 @@
    On :ref:`Windows <windows-compiling>`, load the project file
    :file:`PCbuild\\pcbuild.sln` in Visual Studio, select :menuselection:`Debug`,
    and :menuselection:`Build --> Build Solution`.
-3. :doc:`Run the tests <runtests>` with ``./python -m test -j3`` (use
-   :file:`./python.exe` on :ref:`most <python.exe>` Mac OS X systems and
-   :file:`PCbuild\\python_d.exe` on Windows; replace ``test`` with
-   ``test.regrtest`` for 2.7).
+3. :doc:`Run the tests <runtests>`::
+
+   ./python -m test -j3
+
+   On :ref:`most <mac-python.exe>` Mac OS X systems, replace :file:`./python`
+   with :file:`./python.exe`.  On Windows, use :file:`PCbuild\\python_d.exe` or
+   check the :ref:`Windows instructions <win-python.exe>`.  With Python 2.7,
+   replace ``test`` with ``test.regrtest``.
 4. Make the :doc:`patch <patch>`.
 5. Submit it to the `issue tracker`_.
 
diff --git a/runtests.rst b/runtests.rst
--- a/runtests.rst
+++ b/runtests.rst
@@ -18,10 +18,11 @@
 
     ./python -m test
 
-If you are using Python 2.7, then use the following instead as the basis
-for the commands in this section::
-
-    ./python -m test.regrtest
+You may need to change this command as follows throughout this section.
+On :ref:`most <mac-python.exe>` Mac OS X systems, replace :file:`./python`
+with :file:`./python.exe`.  On Windows, use :file:`PCbuild\\python_d.exe` or
+check the detailed :ref:`Windows instructions <win-python.exe>`.  If using
+Python 2.7, replace ``test`` with ``test.regrtest``.
 
 If you don't have easy access to a command line, you can run the test suite from
 a Python or IDLE shell::
diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -150,7 +150,7 @@
 Otherwise the build failed and thus should be fixed (at least with a bug being
 filed on the `issue tracker`_).
 
-.. _python.exe:
+.. _mac-python.exe:
 
 Once CPython is done building you will then have a working build
 that can be run in-place; ``./python`` on most machines (and what is used in
@@ -216,6 +216,8 @@
 Visual Studio, or choosing Start Debugging from the Debug menu, will launch
 the interpreter.
 
+.. _win-python.exe:
+
 If you want to launch the compiled interpreter from the command-line, the
 path varies according to the build.  For a 32-bit build in debug mode, you
 have to invoke ``PCBuild\python_d.exe``, for a 64-bit build in debug mode,

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

From python-checkins at python.org  Fri Nov 16 03:39:51 2012
From: python-checkins at python.org (brett.cannon)
Date: Fri, 16 Nov 2012 03:39:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315894=3A_Document?=
 =?utf-8?q?_why_we_don=27t_worry_about_re-acquiring_the?=
Message-ID: <3Y2kDl0g2czRb7@mail.python.org>

http://hg.python.org/cpython/rev/bd853311ffe0
changeset:   80451:bd853311ffe0
user:        Brett Cannon <brett at python.org>
date:        Thu Nov 15 21:39:36 2012 -0500
summary:
  Issue #15894: Document why we don't worry about re-acquiring the
global import lock after forking.

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


diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -202,8 +202,11 @@
     if (import_lock_level > 1) {
         /* Forked as a side effect of import */
         long me = PyThread_get_thread_ident();
-        PyThread_acquire_lock(import_lock, 0);
-        /* XXX: can the previous line fail? */
+        /* The following could fail if the lock is already held, but forking as
+           a side-effect of an import is a) rare, b) nuts, and c) difficult to
+           do thanks to the lock only being held when doing individual module
+           locks per import. */
+        PyThread_acquire_lock(import_lock, NOWAIT_LOCK);
         import_lock_thread = me;
         import_lock_level--;
     } else {

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

From solipsis at pitrou.net  Fri Nov 16 05:58:07 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 16 Nov 2012 05:58:07 +0100
Subject: [Python-checkins] Daily reference leaks (e36728b0dcdf): sum=0
Message-ID: <E1TZE0F-0008DL-04@ap.vmr.nerim.net>

results for e36728b0dcdf 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/reflogYxAhtk', '-x']

From python-checkins at python.org  Fri Nov 16 12:18:12 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 16 Nov 2012 12:18:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NDc4OiB1c2Ug?=
 =?utf-8?q?floor_division_in_tabnanny_and_fix_a_ResourceWarning=2E__Patch_?=
 =?utf-8?q?by?=
Message-ID: <3Y2xkr0ltKzRP5@mail.python.org>

http://hg.python.org/cpython/rev/fc17fdd42c66
changeset:   80452:fc17fdd42c66
branch:      3.2
parent:      80436:dd60de9d8dd6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 16 13:17:08 2012 +0200
summary:
  #16478: use floor division in tabnanny and fix a ResourceWarning.  Patch by Serhiy Storchaka.

files:
  Lib/tabnanny.py |  19 +++++++++++--------
  1 files changed, 11 insertions(+), 8 deletions(-)


diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py
--- a/Lib/tabnanny.py
+++ b/Lib/tabnanny.py
@@ -126,6 +126,9 @@
             else: print(file, badline, repr(line))
         return
 
+    finally:
+        f.close()
+
     if verbose:
         print("%r: Clean bill of health." % (file,))
 
@@ -185,21 +188,21 @@
         # count, il = self.norm
         # for i in range(len(count)):
         #    if count[i]:
-        #        il = il + (i/tabsize + 1)*tabsize * count[i]
+        #        il = il + (i//tabsize + 1)*tabsize * count[i]
         # return il
 
         # quicker:
-        # il = trailing + sum (i/ts + 1)*ts*count[i] =
-        # trailing + ts * sum (i/ts + 1)*count[i] =
-        # trailing + ts * sum i/ts*count[i] + count[i] =
-        # trailing + ts * [(sum i/ts*count[i]) + (sum count[i])] =
-        # trailing + ts * [(sum i/ts*count[i]) + num_tabs]
-        # and note that i/ts*count[i] is 0 when i < ts
+        # il = trailing + sum (i//ts + 1)*ts*count[i] =
+        # trailing + ts * sum (i//ts + 1)*count[i] =
+        # trailing + ts * sum i//ts*count[i] + count[i] =
+        # trailing + ts * [(sum i//ts*count[i]) + (sum count[i])] =
+        # trailing + ts * [(sum i//ts*count[i]) + num_tabs]
+        # and note that i//ts*count[i] is 0 when i < ts
 
         count, trailing = self.norm
         il = 0
         for i in range(tabsize, len(count)):
-            il = il + i/tabsize * count[i]
+            il = il + i//tabsize * count[i]
         return trailing + tabsize * (il + self.nt)
 
     # return true iff self.indent_level(t) == other.indent_level(t)

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

From python-checkins at python.org  Fri Nov 16 12:18:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 16 Nov 2012 12:18:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316478=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y2xks2xxpzRP5@mail.python.org>

http://hg.python.org/cpython/rev/d7558e4015a4
changeset:   80453:d7558e4015a4
branch:      3.3
parent:      80444:c574ce78cd61
parent:      80452:fc17fdd42c66
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 16 13:17:42 2012 +0200
summary:
  #16478: merge with 3.2.

files:
  Lib/tabnanny.py |  16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py
--- a/Lib/tabnanny.py
+++ b/Lib/tabnanny.py
@@ -188,21 +188,21 @@
         # count, il = self.norm
         # for i in range(len(count)):
         #    if count[i]:
-        #        il = il + (i/tabsize + 1)*tabsize * count[i]
+        #        il = il + (i//tabsize + 1)*tabsize * count[i]
         # return il
 
         # quicker:
-        # il = trailing + sum (i/ts + 1)*ts*count[i] =
-        # trailing + ts * sum (i/ts + 1)*count[i] =
-        # trailing + ts * sum i/ts*count[i] + count[i] =
-        # trailing + ts * [(sum i/ts*count[i]) + (sum count[i])] =
-        # trailing + ts * [(sum i/ts*count[i]) + num_tabs]
-        # and note that i/ts*count[i] is 0 when i < ts
+        # il = trailing + sum (i//ts + 1)*ts*count[i] =
+        # trailing + ts * sum (i//ts + 1)*count[i] =
+        # trailing + ts * sum i//ts*count[i] + count[i] =
+        # trailing + ts * [(sum i//ts*count[i]) + (sum count[i])] =
+        # trailing + ts * [(sum i//ts*count[i]) + num_tabs]
+        # and note that i//ts*count[i] is 0 when i < ts
 
         count, trailing = self.norm
         il = 0
         for i in range(tabsize, len(count)):
-            il = il + i/tabsize * count[i]
+            il = il + i//tabsize * count[i]
         return trailing + tabsize * (il + self.nt)
 
     # return true iff self.indent_level(t) == other.indent_level(t)

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

From python-checkins at python.org  Fri Nov 16 12:18:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 16 Nov 2012 12:18:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NDc4OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y2xkt5CNZzRVh@mail.python.org>

http://hg.python.org/cpython/rev/377a50f8cb8b
changeset:   80454:377a50f8cb8b
parent:      80451:bd853311ffe0
parent:      80453:d7558e4015a4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 16 13:17:59 2012 +0200
summary:
  #16478: merge with 3.3.

files:
  Lib/tabnanny.py |  16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py
--- a/Lib/tabnanny.py
+++ b/Lib/tabnanny.py
@@ -188,21 +188,21 @@
         # count, il = self.norm
         # for i in range(len(count)):
         #    if count[i]:
-        #        il = il + (i/tabsize + 1)*tabsize * count[i]
+        #        il = il + (i//tabsize + 1)*tabsize * count[i]
         # return il
 
         # quicker:
-        # il = trailing + sum (i/ts + 1)*ts*count[i] =
-        # trailing + ts * sum (i/ts + 1)*count[i] =
-        # trailing + ts * sum i/ts*count[i] + count[i] =
-        # trailing + ts * [(sum i/ts*count[i]) + (sum count[i])] =
-        # trailing + ts * [(sum i/ts*count[i]) + num_tabs]
-        # and note that i/ts*count[i] is 0 when i < ts
+        # il = trailing + sum (i//ts + 1)*ts*count[i] =
+        # trailing + ts * sum (i//ts + 1)*count[i] =
+        # trailing + ts * sum i//ts*count[i] + count[i] =
+        # trailing + ts * [(sum i//ts*count[i]) + (sum count[i])] =
+        # trailing + ts * [(sum i//ts*count[i]) + num_tabs]
+        # and note that i//ts*count[i] is 0 when i < ts
 
         count, trailing = self.norm
         il = 0
         for i in range(tabsize, len(count)):
-            il = il + i/tabsize * count[i]
+            il = il + i//tabsize * count[i]
         return trailing + tabsize * (il + self.nt)
 
     # return true iff self.indent_level(t) == other.indent_level(t)

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

From python-checkins at python.org  Sat Nov 17 00:10:30 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 17 Nov 2012 00:10:30 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Link_to_=22checkout=22_in?=
 =?utf-8?q?_Quick_Start_and_link_=22set_up=22_to_=22setup=22=2E?=
Message-ID: <3Y3FXk6Dh8zRVM@mail.python.org>

http://hg.python.org/devguide/rev/5e1627e8d4e7
changeset:   568:5e1627e8d4e7
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 16 15:09:14 2012 -0800
summary:
  Link to "checkout" in Quick Start and link "set up" to "setup".

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


diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -36,10 +36,13 @@
 Quick Start
 -----------
 
-Here is a list of the basic steps necessary to get set up and make a patch:
+Here is a list of the basic steps needed to get :ref:`set up <setup>` with
+`CPython <http://www.python.org/>`__ and make a patch:
 
-1. Get :ref:`a clone of CPython <setup>` with ``hg clone
-   http://hg.python.org/cpython``.
+1. :ref:`Get the source code <checkout>`::
+
+      hg clone http://hg.python.org/cpython
+
 2. On UNIX, run ``./configure --with-pydebug && make -j2`` to
    :ref:`build Python <compiling>`.
 

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

From python-checkins at python.org  Sat Nov 17 03:43:31 2012
From: python-checkins at python.org (jesus.cea)
Date: Sat, 17 Nov 2012 03:43:31 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNjQ2?=
 =?utf-8?q?1=3A_Wave_library_should_be_able_to_deal_with_4GB_wav_files=2C_?=
 =?utf-8?q?and?=
Message-ID: <3Y3LGW5lKLzRXK@mail.python.org>

http://hg.python.org/cpython/rev/b8ece33ce27d
changeset:   80455:b8ece33ce27d
branch:      2.7
parent:      80439:457c0c9c7893
user:        Jesus Cea <jcea at jcea.es>
date:        Sat Nov 17 03:38:17 2012 +0100
summary:
  Closes #16461: Wave library should be able to deal with 4GB wav files, and sample rate of 44100 Hz.

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


diff --git a/Lib/wave.py b/Lib/wave.py
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -261,9 +261,9 @@
     #
 
     def _read_fmt_chunk(self, chunk):
-        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14))
+        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<HHLLH', chunk.read(14))
         if wFormatTag == WAVE_FORMAT_PCM:
-            sampwidth = struct.unpack('<h', chunk.read(2))[0]
+            sampwidth = struct.unpack('<H', chunk.read(2))[0]
             self._sampwidth = (sampwidth + 7) // 8
         else:
             raise Error, 'unknown format: %r' % (wFormatTag,)
@@ -466,14 +466,14 @@
             self._nframes = initlength / (self._nchannels * self._sampwidth)
         self._datalength = self._nframes * self._nchannels * self._sampwidth
         self._form_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l4s4slhhllhh4s',
+        self._file.write(struct.pack('<L4s4sLHHLLHH4s',
             36 + self._datalength, 'WAVE', 'fmt ', 16,
             WAVE_FORMAT_PCM, self._nchannels, self._framerate,
             self._nchannels * self._framerate * self._sampwidth,
             self._nchannels * self._sampwidth,
             self._sampwidth * 8, 'data'))
         self._data_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l', self._datalength))
+        self._file.write(struct.pack('<L', self._datalength))
         self._headerwritten = True
 
     def _patchheader(self):
@@ -482,9 +482,9 @@
             return
         curpos = self._file.tell()
         self._file.seek(self._form_length_pos, 0)
-        self._file.write(struct.pack('<l', 36 + self._datawritten))
+        self._file.write(struct.pack('<L', 36 + self._datawritten))
         self._file.seek(self._data_length_pos, 0)
-        self._file.write(struct.pack('<l', self._datawritten))
+        self._file.write(struct.pack('<L', self._datawritten))
         self._file.seek(curpos, 0)
         self._datalength = self._datawritten
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -188,6 +188,9 @@
 - Issue #16220: wsgiref now always calls close() on an iterable response.
   Patch by Brent Tubbs.
 
+- Issue #16461: Wave library should be able to deal with 4GB wav files,
+  and sample rate of 44100 Hz.
+
 - Issue #16176: Properly identify Windows 8 via platform.platform()
 
 - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to

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

From python-checkins at python.org  Sat Nov 17 03:43:33 2012
From: python-checkins at python.org (jesus.cea)
Date: Sat, 17 Nov 2012 03:43:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNjQ2?=
 =?utf-8?q?1=3A_Wave_library_should_be_able_to_deal_with_4GB_wav_files=2C_?=
 =?utf-8?q?and?=
Message-ID: <3Y3LGY1QD4zRXv@mail.python.org>

http://hg.python.org/cpython/rev/542bf1c1f2e3
changeset:   80456:542bf1c1f2e3
branch:      3.2
parent:      80452:fc17fdd42c66
user:        Jesus Cea <jcea at jcea.es>
date:        Sat Nov 17 03:41:54 2012 +0100
summary:
  Closes #16461: Wave library should be able to deal with 4GB wav files, and sample rate of 44100 Hz.

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


diff --git a/Lib/wave.py b/Lib/wave.py
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -261,9 +261,9 @@
     #
 
     def _read_fmt_chunk(self, chunk):
-        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<hhllh', chunk.read(14))
+        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<HHLLH', chunk.read(14))
         if wFormatTag == WAVE_FORMAT_PCM:
-            sampwidth = struct.unpack_from('<h', chunk.read(2))[0]
+            sampwidth = struct.unpack_from('<H', chunk.read(2))[0]
             self._sampwidth = (sampwidth + 7) // 8
         else:
             raise Error('unknown format: %r' % (wFormatTag,))
@@ -466,14 +466,14 @@
             self._nframes = initlength // (self._nchannels * self._sampwidth)
         self._datalength = self._nframes * self._nchannels * self._sampwidth
         self._form_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l4s4slhhllhh4s',
+        self._file.write(struct.pack('<L4s4sLHHLLHH4s',
             36 + self._datalength, b'WAVE', b'fmt ', 16,
             WAVE_FORMAT_PCM, self._nchannels, self._framerate,
             self._nchannels * self._framerate * self._sampwidth,
             self._nchannels * self._sampwidth,
             self._sampwidth * 8, b'data'))
         self._data_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l', self._datalength))
+        self._file.write(struct.pack('<L', self._datalength))
         self._headerwritten = True
 
     def _patchheader(self):
@@ -482,9 +482,9 @@
             return
         curpos = self._file.tell()
         self._file.seek(self._form_length_pos, 0)
-        self._file.write(struct.pack('<l', 36 + self._datawritten))
+        self._file.write(struct.pack('<L', 36 + self._datawritten))
         self._file.seek(self._data_length_pos, 0)
-        self._file.write(struct.pack('<l', self._datawritten))
+        self._file.write(struct.pack('<L', self._datawritten))
         self._file.seek(curpos, 0)
         self._datalength = self._datawritten
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -222,6 +222,9 @@
 - Issue #16270: urllib may hang when used for retrieving files via FTP by using
   a context manager.  Patch by Giampaolo Rodola'.
 
+- Issue #16461: Wave library should be able to deal with 4GB wav files,
+  and sample rate of 44100 Hz.
+
 - Issue #16176: Properly identify Windows 8 via platform.platform()
 
 - Issue #16114: The subprocess module no longer provides a misleading

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

From python-checkins at python.org  Sat Nov 17 03:43:34 2012
From: python-checkins at python.org (jesus.cea)
Date: Sat, 17 Nov 2012 03:43:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_MERGE=3A_Closes_=2316461=3A_Wave_library_should_be_able_to_dea?=
 =?utf-8?q?l_with_4GB_wav_files=2C?=
Message-ID: <3Y3LGZ43jSzRYp@mail.python.org>

http://hg.python.org/cpython/rev/f380d749f6bd
changeset:   80457:f380d749f6bd
branch:      3.3
parent:      80453:d7558e4015a4
parent:      80456:542bf1c1f2e3
user:        Jesus Cea <jcea at jcea.es>
date:        Sat Nov 17 03:42:41 2012 +0100
summary:
  MERGE: Closes #16461: Wave library should be able to deal with 4GB wav files, and sample rate of 44100 Hz.

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


diff --git a/Lib/wave.py b/Lib/wave.py
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -261,9 +261,9 @@
     #
 
     def _read_fmt_chunk(self, chunk):
-        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<hhllh', chunk.read(14))
+        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<HHLLH', chunk.read(14))
         if wFormatTag == WAVE_FORMAT_PCM:
-            sampwidth = struct.unpack_from('<h', chunk.read(2))[0]
+            sampwidth = struct.unpack_from('<H', chunk.read(2))[0]
             self._sampwidth = (sampwidth + 7) // 8
         else:
             raise Error('unknown format: %r' % (wFormatTag,))
@@ -466,14 +466,14 @@
             self._nframes = initlength // (self._nchannels * self._sampwidth)
         self._datalength = self._nframes * self._nchannels * self._sampwidth
         self._form_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l4s4slhhllhh4s',
+        self._file.write(struct.pack('<L4s4sLHHLLHH4s',
             36 + self._datalength, b'WAVE', b'fmt ', 16,
             WAVE_FORMAT_PCM, self._nchannels, self._framerate,
             self._nchannels * self._framerate * self._sampwidth,
             self._nchannels * self._sampwidth,
             self._sampwidth * 8, b'data'))
         self._data_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l', self._datalength))
+        self._file.write(struct.pack('<L', self._datalength))
         self._headerwritten = True
 
     def _patchheader(self):
@@ -482,9 +482,9 @@
             return
         curpos = self._file.tell()
         self._file.seek(self._form_length_pos, 0)
-        self._file.write(struct.pack('<l', 36 + self._datawritten))
+        self._file.write(struct.pack('<L', 36 + self._datawritten))
         self._file.seek(self._data_length_pos, 0)
-        self._file.write(struct.pack('<l', self._datawritten))
+        self._file.write(struct.pack('<L', self._datawritten))
         self._file.seek(curpos, 0)
         self._datalength = self._datawritten
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -158,6 +158,9 @@
 - Issue #16270: urllib may hang when used for retrieving files via FTP by using
   a context manager.  Patch by Giampaolo Rodola'.
 
+- Issue #16461: Wave library should be able to deal with 4GB wav files,
+  and sample rate of 44100 Hz.
+
 - Issue #16176: Properly identify Windows 8 via platform.platform()
 
 - Issue #16114: The subprocess module no longer provides a misleading error

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

From python-checkins at python.org  Sat Nov 17 03:43:35 2012
From: python-checkins at python.org (jesus.cea)
Date: Sat, 17 Nov 2012 03:43:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_MERGE=3A_Closes_=2316461=3A_Wave_library_should_be_able_?=
 =?utf-8?q?to_deal_with_4GB_wav_files=2C?=
Message-ID: <3Y3LGb6f9xzRYV@mail.python.org>

http://hg.python.org/cpython/rev/269498958b97
changeset:   80458:269498958b97
parent:      80454:377a50f8cb8b
parent:      80457:f380d749f6bd
user:        Jesus Cea <jcea at jcea.es>
date:        Sat Nov 17 03:43:15 2012 +0100
summary:
  MERGE: Closes #16461: Wave library should be able to deal with 4GB wav files, and sample rate of 44100 Hz.

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


diff --git a/Lib/wave.py b/Lib/wave.py
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -261,9 +261,9 @@
     #
 
     def _read_fmt_chunk(self, chunk):
-        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<hhllh', chunk.read(14))
+        wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<HHLLH', chunk.read(14))
         if wFormatTag == WAVE_FORMAT_PCM:
-            sampwidth = struct.unpack_from('<h', chunk.read(2))[0]
+            sampwidth = struct.unpack_from('<H', chunk.read(2))[0]
             self._sampwidth = (sampwidth + 7) // 8
         else:
             raise Error('unknown format: %r' % (wFormatTag,))
@@ -466,14 +466,14 @@
             self._nframes = initlength // (self._nchannels * self._sampwidth)
         self._datalength = self._nframes * self._nchannels * self._sampwidth
         self._form_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l4s4slhhllhh4s',
+        self._file.write(struct.pack('<L4s4sLHHLLHH4s',
             36 + self._datalength, b'WAVE', b'fmt ', 16,
             WAVE_FORMAT_PCM, self._nchannels, self._framerate,
             self._nchannels * self._framerate * self._sampwidth,
             self._nchannels * self._sampwidth,
             self._sampwidth * 8, b'data'))
         self._data_length_pos = self._file.tell()
-        self._file.write(struct.pack('<l', self._datalength))
+        self._file.write(struct.pack('<L', self._datalength))
         self._headerwritten = True
 
     def _patchheader(self):
@@ -482,9 +482,9 @@
             return
         curpos = self._file.tell()
         self._file.seek(self._form_length_pos, 0)
-        self._file.write(struct.pack('<l', 36 + self._datawritten))
+        self._file.write(struct.pack('<L', 36 + self._datawritten))
         self._file.seek(self._data_length_pos, 0)
-        self._file.write(struct.pack('<l', self._datawritten))
+        self._file.write(struct.pack('<L', self._datawritten))
         self._file.seek(curpos, 0)
         self._datalength = self._datawritten
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -240,6 +240,9 @@
 - Issue #16270: urllib may hang when used for retrieving files via FTP by using
   a context manager.  Patch by Giampaolo Rodola'.
 
+- Issue #16461: Wave library should be able to deal with 4GB wav files,
+  and sample rate of 44100 Hz.
+
 - Issue #16176: Properly identify Windows 8 via platform.platform()
 
 - Issue #16088: BaseHTTPRequestHandler's send_error method includes a

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

From solipsis at pitrou.net  Sat Nov 17 05:56:41 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 17 Nov 2012 05:56:41 +0100
Subject: [Python-checkins] Daily reference leaks (377a50f8cb8b): sum=0
Message-ID: <E1TZaSP-00007S-J2@ap.vmr.nerim.net>

results for 377a50f8cb8b on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Sat Nov 17 11:06:58 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:06:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NDcwOiBtZW50?=
 =?utf-8?q?ion_set_and_dict_comprehension_in_the_tutorial=2E__Patch_by_Yon?=
 =?utf-8?q?gzhi?=
Message-ID: <3Y3X6B2B22zRKp@mail.python.org>

http://hg.python.org/cpython/rev/2e2e7f398864
changeset:   80459:2e2e7f398864
branch:      2.7
parent:      80455:b8ece33ce27d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:02:30 2012 +0200
summary:
  #16470: mention set and dict comprehension in the tutorial.  Patch by Yongzhi Pan.

files:
  Doc/tutorial/datastructures.rst |  27 ++++++++++++++------
  1 files changed, 19 insertions(+), 8 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -229,6 +229,7 @@
 such a common need, a built-in function ``sum(sequence)`` is already provided,
 and works exactly like this.
 
+.. _tut-listcomps:
 
 List Comprehensions
 -------------------
@@ -485,6 +486,10 @@
 eliminating duplicate entries.  Set objects also support mathematical operations
 like union, intersection, difference, and symmetric difference.
 
+Curly braces or the :func:`set` function can be used to create sets.  Note: to
+create an empty set you have to use ``set()``, not ``{}``; the latter creates an
+empty dictionary, a data structure that we discuss in the next section.
+
 Here is a brief demonstration::
 
    >>> basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
@@ -511,6 +516,13 @@
    >>> a ^ b                              # letters in a or b but not both
    set(['r', 'd', 'b', 'm', 'z', 'l'])
 
+Similarly to :ref:`list comprehensions <tut-listcomps>`, set comprehensions
+are also supported::
+
+   >>> a = {x for x in 'abracadabra' if x not in 'abc'}
+   >>> a
+   set(['r', 'd'])
+
 
 .. _tut-dictionaries:
 
@@ -562,19 +574,18 @@
    >>> 'guido' in tel
    True
 
-The :func:`dict` constructor builds dictionaries directly from lists of
-key-value pairs stored as tuples.  When the pairs form a pattern, list
-comprehensions can compactly specify the key-value list. ::
+The :func:`dict` constructor builds dictionaries directly from sequences of
+key-value pairs::
 
    >>> dict([('sape', 4139), ('guido', 4127), ('jack', 4098)])
    {'sape': 4139, 'jack': 4098, 'guido': 4127}
-   >>> dict([(x, x**2) for x in (2, 4, 6)])     # use a list comprehension
+
+In addition, dict comprehensions can be used to create dictionaries from
+arbitrary key and value expressions::
+
+   >>> {x: x**2 for x in (2, 4, 6)}
    {2: 4, 4: 16, 6: 36}
 
-Later in the tutorial, we will learn about Generator Expressions which are even
-better suited for the task of supplying key-values pairs to the :func:`dict`
-constructor.
-
 When the keys are simple strings, it is sometimes easier to specify pairs using
 keyword arguments::
 

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

From python-checkins at python.org  Sat Nov 17 11:06:59 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:06:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Rephrase_a_sen?=
 =?utf-8?q?tence_in_the_set_and_dict_comprehensions_tutorial_page=2E?=
Message-ID: <3Y3X6C4vt4zRKp@mail.python.org>

http://hg.python.org/cpython/rev/49cf38158c8b
changeset:   80460:49cf38158c8b
branch:      3.2
parent:      80456:542bf1c1f2e3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:06:01 2012 +0200
summary:
  Rephrase a sentence in the set and dict comprehensions tutorial page.

files:
  Doc/tutorial/datastructures.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -413,7 +413,7 @@
 eliminating duplicate entries.  Set objects also support mathematical operations
 like union, intersection, difference, and symmetric difference.
 
-Curly braces or the :func:`set` function can be used to create sets.  Note: To
+Curly braces or the :func:`set` function can be used to create sets.  Note: to
 create an empty set you have to use ``set()``, not ``{}``; the latter creates an
 empty dictionary, a data structure that we discuss in the next section.
 
@@ -442,14 +442,14 @@
    >>> a ^ b                              # letters in a or b but not both
    {'r', 'd', 'b', 'm', 'z', 'l'}
 
-Like :ref:`for lists <tut-listcomps>`, there is a set comprehension syntax::
+Similarly to :ref:`list comprehensions <tut-listcomps>`, set comprehensions
+are also supported::
 
    >>> a = {x for x in 'abracadabra' if x not in 'abc'}
    >>> a
    {'r', 'd'}
 
 
-
 .. _tut-dictionaries:
 
 Dictionaries

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

From python-checkins at python.org  Sat Nov 17 11:07:01 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:07:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_rephrasing_with_3=2E2=2E?=
Message-ID: <3Y3X6F0gHHzRTB@mail.python.org>

http://hg.python.org/cpython/rev/8a5a68d988f9
changeset:   80461:8a5a68d988f9
branch:      3.3
parent:      80457:f380d749f6bd
parent:      80460:49cf38158c8b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:06:26 2012 +0200
summary:
  Merge rephrasing with 3.2.

files:
  Doc/tutorial/datastructures.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -418,7 +418,7 @@
 eliminating duplicate entries.  Set objects also support mathematical operations
 like union, intersection, difference, and symmetric difference.
 
-Curly braces or the :func:`set` function can be used to create sets.  Note: To
+Curly braces or the :func:`set` function can be used to create sets.  Note: to
 create an empty set you have to use ``set()``, not ``{}``; the latter creates an
 empty dictionary, a data structure that we discuss in the next section.
 
@@ -447,14 +447,14 @@
    >>> a ^ b                              # letters in a or b but not both
    {'r', 'd', 'b', 'm', 'z', 'l'}
 
-Like :ref:`for lists <tut-listcomps>`, there is a set comprehension syntax::
+Similarly to :ref:`list comprehensions <tut-listcomps>`, set comprehensions
+are also supported::
 
    >>> a = {x for x in 'abracadabra' if x not in 'abc'}
    >>> a
    {'r', 'd'}
 
 
-
 .. _tut-dictionaries:
 
 Dictionaries

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

From python-checkins at python.org  Sat Nov 17 11:07:02 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:07:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_rephrasing_with_3=2E3=2E?=
Message-ID: <3Y3X6G3K1jzRNS@mail.python.org>

http://hg.python.org/cpython/rev/02a9b1a82185
changeset:   80462:02a9b1a82185
parent:      80458:269498958b97
parent:      80461:8a5a68d988f9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:06:44 2012 +0200
summary:
  Merge rephrasing with 3.3.

files:
  Doc/tutorial/datastructures.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -418,7 +418,7 @@
 eliminating duplicate entries.  Set objects also support mathematical operations
 like union, intersection, difference, and symmetric difference.
 
-Curly braces or the :func:`set` function can be used to create sets.  Note: To
+Curly braces or the :func:`set` function can be used to create sets.  Note: to
 create an empty set you have to use ``set()``, not ``{}``; the latter creates an
 empty dictionary, a data structure that we discuss in the next section.
 
@@ -447,14 +447,14 @@
    >>> a ^ b                              # letters in a or b but not both
    {'r', 'd', 'b', 'm', 'z', 'l'}
 
-Like :ref:`for lists <tut-listcomps>`, there is a set comprehension syntax::
+Similarly to :ref:`list comprehensions <tut-listcomps>`, set comprehensions
+are also supported::
 
    >>> a = {x for x in 'abracadabra' if x not in 'abc'}
    >>> a
    {'r', 'd'}
 
 
-
 .. _tut-dictionaries:
 
 Dictionaries

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

From python-checkins at python.org  Sat Nov 17 11:56:41 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:56:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Update_section?=
 =?utf-8?q?_about_dir=28=29_in_the_tutorial=2E?=
Message-ID: <3Y3YCY1rMXzRSV@mail.python.org>

http://hg.python.org/cpython/rev/770bbc93ae89
changeset:   80463:770bbc93ae89
branch:      2.7
parent:      80459:2e2e7f398864
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:46:40 2012 +0200
summary:
  Update section about dir() in the tutorial.

files:
  Doc/tutorial/modules.rst |  59 +++++++++++++++------------
  1 files changed, 33 insertions(+), 26 deletions(-)


diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -282,16 +282,21 @@
    >>> import fibo, sys
    >>> dir(fibo)
    ['__name__', 'fib', 'fib2']
-   >>> dir(sys)
-   ['__displayhook__', '__doc__', '__excepthook__', '__name__', '__stderr__',
-    '__stdin__', '__stdout__', '_getframe', 'api_version', 'argv',
-    'builtin_module_names', 'byteorder', 'callstats', 'copyright',
-    'displayhook', 'exc_clear', 'exc_info', 'exc_type', 'excepthook',
-    'exec_prefix', 'executable', 'exit', 'getdefaultencoding', 'getdlopenflags',
-    'getrecursionlimit', 'getrefcount', 'hexversion', 'maxint', 'maxunicode',
-    'meta_path', 'modules', 'path', 'path_hooks', 'path_importer_cache',
-    'platform', 'prefix', 'ps1', 'ps2', 'setcheckinterval', 'setdlopenflags',
-    'setprofile', 'setrecursionlimit', 'settrace', 'stderr', 'stdin', 'stdout',
+   >>> dir(sys)  # doctest: +NORMALIZE_WHITESPACE
+   ['__displayhook__', '__doc__', '__excepthook__', '__name__', '__package__',
+    '__stderr__', '__stdin__', '__stdout__', '_clear_type_cache',
+    '_current_frames', '_getframe', '_mercurial', 'api_version', 'argv',
+    'builtin_module_names', 'byteorder', 'call_tracing', 'callstats',
+    'copyright', 'displayhook', 'dont_write_bytecode', 'exc_clear', 'exc_info',
+    'exc_traceback', 'exc_type', 'exc_value', 'excepthook', 'exec_prefix',
+    'executable', 'exit', 'flags', 'float_info', 'float_repr_style',
+    'getcheckinterval', 'getdefaultencoding', 'getdlopenflags',
+    'getfilesystemencoding', 'getobjects', 'getprofile', 'getrecursionlimit',
+    'getrefcount', 'getsizeof', 'gettotalrefcount', 'gettrace', 'hexversion',
+    'long_info', 'maxint', 'maxsize', 'maxunicode', 'meta_path', 'modules',
+    'path', 'path_hooks', 'path_importer_cache', 'platform', 'prefix', 'ps1',
+    'py3kwarning', 'setcheckinterval', 'setdlopenflags', 'setprofile',
+    'setrecursionlimit', 'settrace', 'stderr', 'stdin', 'stdout', 'subversion',
     'version', 'version_info', 'warnoptions']
 
 Without arguments, :func:`dir` lists the names you have defined currently::
@@ -300,7 +305,7 @@
    >>> import fibo
    >>> fib = fibo.fib
    >>> dir()
-   ['__builtins__', '__doc__', '__file__', '__name__', 'a', 'fib', 'fibo', 'sys']
+   ['__builtins__', '__name__', '__package__', 'a', 'fib', 'fibo', 'sys']
 
 Note that it lists all types of names: variables, modules, functions, etc.
 
@@ -311,10 +316,11 @@
 :mod:`__builtin__`::
 
    >>> import __builtin__
-   >>> dir(__builtin__)
-   ['ArithmeticError', 'AssertionError', 'AttributeError', 'DeprecationWarning',
-    'EOFError', 'Ellipsis', 'EnvironmentError', 'Exception', 'False',
-    'FloatingPointError', 'FutureWarning', 'IOError', 'ImportError',
+   >>> dir(__builtin__)  # doctest: +NORMALIZE_WHITESPACE
+   ['ArithmeticError', 'AssertionError', 'AttributeError', 'BaseException',
+    'BufferError', 'BytesWarning', 'DeprecationWarning', 'EOFError',
+    'Ellipsis', 'EnvironmentError', 'Exception', 'False', 'FloatingPointError',
+    'FutureWarning', 'GeneratorExit', 'IOError', 'ImportError', 'ImportWarning',
     'IndentationError', 'IndexError', 'KeyError', 'KeyboardInterrupt',
     'LookupError', 'MemoryError', 'NameError', 'None', 'NotImplemented',
     'NotImplementedError', 'OSError', 'OverflowError',
@@ -323,18 +329,19 @@
     'SyntaxWarning', 'SystemError', 'SystemExit', 'TabError', 'True',
     'TypeError', 'UnboundLocalError', 'UnicodeDecodeError',
     'UnicodeEncodeError', 'UnicodeError', 'UnicodeTranslateError',
-    'UserWarning', 'ValueError', 'Warning', 'WindowsError',
+    'UnicodeWarning', 'UserWarning', 'ValueError', 'Warning',
     'ZeroDivisionError', '_', '__debug__', '__doc__', '__import__',
-    '__name__', 'abs', 'apply', 'basestring', 'bool', 'buffer',
-    'callable', 'chr', 'classmethod', 'cmp', 'coerce', 'compile',
-    'complex', 'copyright', 'credits', 'delattr', 'dict', 'dir', 'divmod',
-    'enumerate', 'eval', 'execfile', 'exit', 'file', 'filter', 'float',
-    'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex',
-    'id', 'input', 'int', 'intern', 'isinstance', 'issubclass', 'iter',
-    'len', 'license', 'list', 'locals', 'long', 'map', 'max', 'memoryview',
-    'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'quit', 'range',
-    'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set',
-    'setattr', 'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super',
+    '__name__', '__package__', 'abs', 'all', 'any', 'apply', 'basestring',
+    'bin', 'bool', 'buffer', 'bytearray', 'bytes', 'callable', 'chr',
+    'classmethod', 'cmp', 'coerce', 'compile', 'complex', 'copyright',
+    'credits', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval',
+    'execfile', 'exit', 'file', 'filter', 'float', 'format', 'frozenset',
+    'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id', 'input',
+    'int', 'intern', 'isinstance', 'issubclass', 'iter', 'len', 'license',
+    'list', 'locals', 'long', 'map', 'max', 'memoryview', 'min', 'next',
+    'object', 'oct', 'open', 'ord', 'pow', 'print', 'property', 'quit',
+    'range', 'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round',
+    'set', 'setattr', 'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super',
     'tuple', 'type', 'unichr', 'unicode', 'vars', 'xrange', 'zip']
 
 

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

From python-checkins at python.org  Sat Nov 17 11:56:42 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:56:42 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Update_section?=
 =?utf-8?q?_about_dir=28=29_in_the_tutorial=2E?=
Message-ID: <3Y3YCZ5pd0zRTS@mail.python.org>

http://hg.python.org/cpython/rev/120757b34806
changeset:   80464:120757b34806
branch:      3.2
parent:      80460:49cf38158c8b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:50:14 2012 +0200
summary:
  Update section about dir() in the tutorial.

files:
  Doc/tutorial/modules.rst |  74 +++++++++++++++------------
  1 files changed, 41 insertions(+), 33 deletions(-)


diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -288,16 +288,21 @@
    >>> import fibo, sys
    >>> dir(fibo)
    ['__name__', 'fib', 'fib2']
-   >>> dir(sys)
-   ['__displayhook__', '__doc__', '__excepthook__', '__name__', '__stderr__',
-    '__stdin__', '__stdout__', '_getframe', 'api_version', 'argv',
-    'builtin_module_names', 'byteorder', 'callstats', 'copyright',
-    'displayhook', 'exc_info', 'excepthook',
-    'exec_prefix', 'executable', 'exit', 'getdefaultencoding', 'getdlopenflags',
-    'getrecursionlimit', 'getrefcount', 'hexversion', 'maxint', 'maxunicode',
-    'meta_path', 'modules', 'path', 'path_hooks', 'path_importer_cache',
-    'platform', 'prefix', 'ps1', 'ps2', 'setcheckinterval', 'setdlopenflags',
-    'setprofile', 'setrecursionlimit', 'settrace', 'stderr', 'stdin', 'stdout',
+   >>> dir(sys)  # doctest: +NORMALIZE_WHITESPACE
+   ['__displayhook__', '__doc__', '__excepthook__', '__name__', '__package__',
+    '__stderr__', '__stdin__', '__stdout__', '_clear_type_cache',
+    '_current_frames', '_getframe', '_mercurial', '_xoptions', 'abiflags',
+    'api_version', 'argv', 'builtin_module_names', 'byteorder', 'call_tracing',
+    'callstats', 'copyright', 'displayhook', 'dont_write_bytecode', 'exc_info',
+    'excepthook', 'exec_prefix', 'executable', 'exit', 'flags', 'float_info',
+    'float_repr_style', 'getcheckinterval', 'getdefaultencoding',
+    'getdlopenflags', 'getfilesystemencoding', 'getobjects', 'getprofile',
+    'getrecursionlimit', 'getrefcount', 'getsizeof', 'getswitchinterval',
+    'gettotalrefcount', 'gettrace', 'hash_info', 'hexversion', 'int_info',
+    'intern', 'maxsize', 'maxunicode', 'meta_path', 'modules', 'path',
+    'path_hooks', 'path_importer_cache', 'platform', 'prefix', 'ps1',
+    'setcheckinterval', 'setdlopenflags', 'setprofile', 'setrecursionlimit',
+    'setswitchinterval', 'settrace', 'stderr', 'stdin', 'stdout', 'subversion',
     'version', 'version_info', 'warnoptions']
 
 Without arguments, :func:`dir` lists the names you have defined currently::
@@ -306,7 +311,7 @@
    >>> import fibo
    >>> fib = fibo.fib
    >>> dir()
-   ['__builtins__', '__doc__', '__file__', '__name__', 'a', 'fib', 'fibo', 'sys']
+   ['__builtins__', '__name__', 'a', 'fib', 'fibo', 'sys']
 
 Note that it lists all types of names: variables, modules, functions, etc.
 
@@ -317,28 +322,31 @@
 :mod:`builtins`::
 
    >>> import builtins
-   >>> dir(builtins)
-
-   ['ArithmeticError', 'AssertionError', 'AttributeError', 'BaseException', 'Buffer
-   Error', 'BytesWarning', 'DeprecationWarning', 'EOFError', 'Ellipsis', 'Environme
-   ntError', 'Exception', 'False', 'FloatingPointError', 'FutureWarning', 'Generato
-   rExit', 'IOError', 'ImportError', 'ImportWarning', 'IndentationError', 'IndexErr
-   or', 'KeyError', 'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError',
-    'None', 'NotImplemented', 'NotImplementedError', 'OSError', 'OverflowError', 'P
-   endingDeprecationWarning', 'ReferenceError', 'RuntimeError', 'RuntimeWarning', '
-   StopIteration', 'SyntaxError', 'SyntaxWarning', 'SystemError', 'SystemExit', 'Ta
-   bError', 'True', 'TypeError', 'UnboundLocalError', 'UnicodeDecodeError', 'Unicod
-   eEncodeError', 'UnicodeError', 'UnicodeTranslateError', 'UnicodeWarning', 'UserW
-   arning', 'ValueError', 'Warning', 'ZeroDivisionError', '__build_class__', '__deb
-   ug__', '__doc__', '__import__', '__name__', '__package__', 'abs', 'all', 'any',
-   'ascii', 'bin', 'bool', 'bytearray', 'bytes', 'chr', 'classmethod', 'compile', '
-   complex', 'copyright', 'credits', 'delattr', 'dict', 'dir', 'divmod', 'enumerate
-   ', 'eval', 'exec', 'exit', 'filter', 'float', 'format', 'frozenset', 'getattr',
-   'globals', 'hasattr', 'hash', 'help', 'hex', 'id', 'input', 'int', 'isinstance',
-    'issubclass', 'iter', 'len', 'license', 'list', 'locals', 'map', 'max', 'memory
-   view', 'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print', 'property'
-   , 'quit', 'range', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice', 'sort
-   ed', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'vars', 'zip']
+   >>> dir(builtins)  # doctest: +NORMALIZE_WHITESPACE
+   ['ArithmeticError', 'AssertionError', 'AttributeError', 'BaseException',
+    'BufferError', 'BytesWarning', 'DeprecationWarning', 'EOFError',
+    'Ellipsis', 'EnvironmentError', 'Exception', 'False', 'FloatingPointError',
+    'FutureWarning', 'GeneratorExit', 'IOError', 'ImportError',
+    'ImportWarning', 'IndentationError', 'IndexError', 'KeyError',
+    'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError', 'None',
+    'NotImplemented', 'NotImplementedError', 'OSError', 'OverflowError',
+    'PendingDeprecationWarning', 'ReferenceError', 'ResourceWarning',
+    'RuntimeError', 'RuntimeWarning', 'StopIteration', 'SyntaxError',
+    'SyntaxWarning', 'SystemError', 'SystemExit', 'TabError', 'True',
+    'TypeError', 'UnboundLocalError', 'UnicodeDecodeError',
+    'UnicodeEncodeError', 'UnicodeError', 'UnicodeTranslateError',
+    'UnicodeWarning', 'UserWarning', 'ValueError', 'Warning',
+    'ZeroDivisionError', '_', '__build_class__', '__debug__', '__doc__',
+    '__import__', '__name__', '__package__', 'abs', 'all', 'any', 'ascii',
+    'bin', 'bool', 'bytearray', 'bytes', 'callable', 'chr', 'classmethod',
+    'compile', 'complex', 'copyright', 'credits', 'delattr', 'dict', 'dir',
+    'divmod', 'enumerate', 'eval', 'exec', 'exit', 'filter', 'float', 'format',
+    'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id',
+    'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'license',
+    'list', 'locals', 'map', 'max', 'memoryview', 'min', 'next', 'object',
+    'oct', 'open', 'ord', 'pow', 'print', 'property', 'quit', 'range', 'repr',
+    'reversed', 'round', 'set', 'setattr', 'slice', 'sorted', 'staticmethod',
+    'str', 'sum', 'super', 'tuple', 'type', 'vars', 'zip']
 
 .. _tut-packages:
 

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

From python-checkins at python.org  Sat Nov 17 11:57:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 11:57:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_updates_about_dir=28=29_with_3=2E3=2E?=
Message-ID: <3Y3YDB2mt5zRSV@mail.python.org>

http://hg.python.org/cpython/rev/18c47f9d6303
changeset:   80466:18c47f9d6303
parent:      80462:02a9b1a82185
parent:      80465:96756204f125
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 12:56:29 2012 +0200
summary:
  Merge updates about dir() with 3.3.

files:
  Doc/tutorial/modules.rst |  83 ++++++++++++++++-----------
  1 files changed, 49 insertions(+), 34 deletions(-)


diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -288,17 +288,24 @@
    >>> import fibo, sys
    >>> dir(fibo)
    ['__name__', 'fib', 'fib2']
-   >>> dir(sys)
-   ['__displayhook__', '__doc__', '__excepthook__', '__name__', '__stderr__',
-    '__stdin__', '__stdout__', '_getframe', 'api_version', 'argv',
-    'builtin_module_names', 'byteorder', 'callstats', 'copyright',
-    'displayhook', 'exc_info', 'excepthook',
-    'exec_prefix', 'executable', 'exit', 'getdefaultencoding', 'getdlopenflags',
-    'getrecursionlimit', 'getrefcount', 'hexversion', 'maxint', 'maxunicode',
-    'meta_path', 'modules', 'path', 'path_hooks', 'path_importer_cache',
-    'platform', 'prefix', 'ps1', 'ps2', 'setcheckinterval', 'setdlopenflags',
-    'setprofile', 'setrecursionlimit', 'settrace', 'stderr', 'stdin', 'stdout',
-    'version', 'version_info', 'warnoptions']
+   >>> dir(sys)  # doctest: +NORMALIZE_WHITESPACE
+   ['__displayhook__', '__doc__', '__excepthook__', '__loader__', '__name__',
+    '__package__', '__stderr__', '__stdin__', '__stdout__',
+    '_clear_type_cache', '_current_frames', '_debugmallocstats', '_getframe',
+    '_home', '_mercurial', '_xoptions', 'abiflags', 'api_version', 'argv',
+    'base_exec_prefix', 'base_prefix', 'builtin_module_names', 'byteorder',
+    'call_tracing', 'callstats', 'copyright', 'displayhook',
+    'dont_write_bytecode', 'exc_info', 'excepthook', 'exec_prefix',
+    'executable', 'exit', 'flags', 'float_info', 'float_repr_style',
+    'getcheckinterval', 'getdefaultencoding', 'getdlopenflags',
+    'getfilesystemencoding', 'getobjects', 'getprofile', 'getrecursionlimit',
+    'getrefcount', 'getsizeof', 'getswitchinterval', 'gettotalrefcount',
+    'gettrace', 'hash_info', 'hexversion', 'implementation', 'int_info',
+    'intern', 'maxsize', 'maxunicode', 'meta_path', 'modules', 'path',
+    'path_hooks', 'path_importer_cache', 'platform', 'prefix', 'ps1',
+    'setcheckinterval', 'setdlopenflags', 'setprofile', 'setrecursionlimit',
+    'setswitchinterval', 'settrace', 'stderr', 'stdin', 'stdout',
+    'thread_info', 'version', 'version_info', 'warnoptions']
 
 Without arguments, :func:`dir` lists the names you have defined currently::
 
@@ -306,7 +313,7 @@
    >>> import fibo
    >>> fib = fibo.fib
    >>> dir()
-   ['__builtins__', '__doc__', '__file__', '__name__', 'a', 'fib', 'fibo', 'sys']
+   ['__builtins__', '__name__', 'a', 'fib', 'fibo', 'sys']
 
 Note that it lists all types of names: variables, modules, functions, etc.
 
@@ -317,28 +324,36 @@
 :mod:`builtins`::
 
    >>> import builtins
-   >>> dir(builtins)
-
-   ['ArithmeticError', 'AssertionError', 'AttributeError', 'BaseException', 'Buffer
-   Error', 'BytesWarning', 'DeprecationWarning', 'EOFError', 'Ellipsis', 'Environme
-   ntError', 'Exception', 'False', 'FloatingPointError', 'FutureWarning', 'Generato
-   rExit', 'IOError', 'ImportError', 'ImportWarning', 'IndentationError', 'IndexErr
-   or', 'KeyError', 'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError',
-    'None', 'NotImplemented', 'NotImplementedError', 'OSError', 'OverflowError', 'P
-   endingDeprecationWarning', 'ReferenceError', 'RuntimeError', 'RuntimeWarning', '
-   StopIteration', 'SyntaxError', 'SyntaxWarning', 'SystemError', 'SystemExit', 'Ta
-   bError', 'True', 'TypeError', 'UnboundLocalError', 'UnicodeDecodeError', 'Unicod
-   eEncodeError', 'UnicodeError', 'UnicodeTranslateError', 'UnicodeWarning', 'UserW
-   arning', 'ValueError', 'Warning', 'ZeroDivisionError', '__build_class__', '__deb
-   ug__', '__doc__', '__import__', '__name__', '__package__', 'abs', 'all', 'any',
-   'ascii', 'bin', 'bool', 'bytearray', 'bytes', 'chr', 'classmethod', 'compile', '
-   complex', 'copyright', 'credits', 'delattr', 'dict', 'dir', 'divmod', 'enumerate
-   ', 'eval', 'exec', 'exit', 'filter', 'float', 'format', 'frozenset', 'getattr',
-   'globals', 'hasattr', 'hash', 'help', 'hex', 'id', 'input', 'int', 'isinstance',
-    'issubclass', 'iter', 'len', 'license', 'list', 'locals', 'map', 'max', 'memory
-   view', 'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print', 'property'
-   , 'quit', 'range', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice', 'sort
-   ed', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'vars', 'zip']
+   >>> dir(builtins)  # doctest: +NORMALIZE_WHITESPACE
+   ['ArithmeticError', 'AssertionError', 'AttributeError', 'BaseException',
+    'BlockingIOError', 'BrokenPipeError', 'BufferError', 'BytesWarning',
+    'ChildProcessError', 'ConnectionAbortedError', 'ConnectionError',
+    'ConnectionRefusedError', 'ConnectionResetError', 'DeprecationWarning',
+    'EOFError', 'Ellipsis', 'EnvironmentError', 'Exception', 'False',
+    'FileExistsError', 'FileNotFoundError', 'FloatingPointError',
+    'FutureWarning', 'GeneratorExit', 'IOError', 'ImportError',
+    'ImportWarning', 'IndentationError', 'IndexError', 'InterruptedError',
+    'IsADirectoryError', 'KeyError', 'KeyboardInterrupt', 'LookupError',
+    'MemoryError', 'NameError', 'None', 'NotADirectoryError', 'NotImplemented',
+    'NotImplementedError', 'OSError', 'OverflowError',
+    'PendingDeprecationWarning', 'PermissionError', 'ProcessLookupError',
+    'ReferenceError', 'ResourceWarning', 'RuntimeError', 'RuntimeWarning',
+    'StopIteration', 'SyntaxError', 'SyntaxWarning', 'SystemError',
+    'SystemExit', 'TabError', 'TimeoutError', 'True', 'TypeError',
+    'UnboundLocalError', 'UnicodeDecodeError', 'UnicodeEncodeError',
+    'UnicodeError', 'UnicodeTranslateError', 'UnicodeWarning', 'UserWarning',
+    'ValueError', 'Warning', 'ZeroDivisionError', '_', '__build_class__',
+    '__debug__', '__doc__', '__import__', '__name__', '__package__', 'abs',
+    'all', 'any', 'ascii', 'bin', 'bool', 'bytearray', 'bytes', 'callable',
+    'chr', 'classmethod', 'compile', 'complex', 'copyright', 'credits',
+    'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'exec', 'exit',
+    'filter', 'float', 'format', 'frozenset', 'getattr', 'globals', 'hasattr',
+    'hash', 'help', 'hex', 'id', 'input', 'int', 'isinstance', 'issubclass',
+    'iter', 'len', 'license', 'list', 'locals', 'map', 'max', 'memoryview',
+    'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print', 'property',
+    'quit', 'range', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
+    'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'vars',
+    'zip']
 
 .. _tut-packages:
 

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

From python-checkins at python.org  Sat Nov 17 15:33:48 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 17 Nov 2012 15:33:48 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NDg5?=
 =?utf-8?q?=3A_Make_it_clearer_that_importlib=2Efind=5Floader=28=29_requir?=
 =?utf-8?q?es?=
Message-ID: <3Y3f244swqzRTW@mail.python.org>

http://hg.python.org/cpython/rev/358be7742377
changeset:   80467:358be7742377
branch:      3.3
parent:      80465:96756204f125
user:        Brett Cannon <brett at python.org>
date:        Sat Nov 17 09:30:55 2012 -0500
summary:
  Issue #16489: Make it clearer that importlib.find_loader() requires
the user to import any parent packages.

files:
  Doc/library/importlib.rst |  9 ++++-----
  Lib/importlib/__init__.py |  4 +++-
  Misc/NEWS                 |  3 +++
  3 files changed, 10 insertions(+), 6 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -94,11 +94,10 @@
    :exc:`ValueError` is raised). Otherwise a search using :attr:`sys.meta_path`
    is done. ``None`` is returned if no loader is found.
 
-   A dotted name does not have its parent's implicitly imported. If that is
-   desired (although not nessarily required to find the loader, it will most
-   likely be needed if the loader actually is used to load the module), then
-   you will have to import the packages containing the module prior to calling
-   this function.
+   A dotted name does not have its parent's implicitly imported as that requires
+   loading them and that may not be desired. To properly import a submodule you
+   will need to import all parent packages of the submodule and use the correct
+   argument to *path*.
 
 .. function:: invalidate_caches()
 
diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py
--- a/Lib/importlib/__init__.py
+++ b/Lib/importlib/__init__.py
@@ -55,7 +55,9 @@
     value of 'path' given to the finders. None is returned if no loader could
     be found.
 
-    Dotted names do not have their parent packages implicitly imported.
+    Dotted names do not have their parent packages implicitly imported. You will
+    most likely need to explicitly import all parent packages in the proper
+    order for a submodule to get the correct loader.
 
     """
     try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -271,6 +271,9 @@
 Documentation
 -------------
 
+- Issue #16489: Make it clearer that importlib.find_loader() requires any and
+  all packages to be separately imported.
+
 - Issue #16400: Update the description of which versions of a given package
   PyPI displays.
 

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

From python-checkins at python.org  Sat Nov 17 15:33:50 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 17 Nov 2012 15:33:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_fix_for_=2316489_from_3=2E3?=
Message-ID: <3Y3f260NxszRWT@mail.python.org>

http://hg.python.org/cpython/rev/ba1d7447bd1b
changeset:   80468:ba1d7447bd1b
parent:      80466:18c47f9d6303
parent:      80467:358be7742377
user:        Brett Cannon <brett at python.org>
date:        Sat Nov 17 09:33:14 2012 -0500
summary:
  Merge fix for #16489 from 3.3

files:
  Doc/library/importlib.rst |  9 ++++-----
  Lib/importlib/__init__.py |  4 +++-
  Misc/NEWS                 |  3 +++
  3 files changed, 10 insertions(+), 6 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -94,11 +94,10 @@
    :exc:`ValueError` is raised). Otherwise a search using :attr:`sys.meta_path`
    is done. ``None`` is returned if no loader is found.
 
-   A dotted name does not have its parent's implicitly imported. If that is
-   desired (although not nessarily required to find the loader, it will most
-   likely be needed if the loader actually is used to load the module), then
-   you will have to import the packages containing the module prior to calling
-   this function.
+   A dotted name does not have its parent's implicitly imported as that requires
+   loading them and that may not be desired. To properly import a submodule you
+   will need to import all parent packages of the submodule and use the correct
+   argument to *path*.
 
 .. function:: invalidate_caches()
 
diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py
--- a/Lib/importlib/__init__.py
+++ b/Lib/importlib/__init__.py
@@ -55,7 +55,9 @@
     value of 'path' given to the finders. None is returned if no loader could
     be found.
 
-    Dotted names do not have their parent packages implicitly imported.
+    Dotted names do not have their parent packages implicitly imported. You will
+    most likely need to explicitly import all parent packages in the proper
+    order for a submodule to get the correct loader.
 
     """
     try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -376,6 +376,9 @@
 Documentation
 -------------
 
+- Issue #16489: Make it clearer that importlib.find_loader() needs parent
+  packages to be explicitly imported.
+
 - Issue #16400: Update the description of which versions of a given package
   PyPI displays.
 

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

From python-checkins at python.org  Sat Nov 17 16:11:44 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 17 Nov 2012 16:11:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Mark_PEP_3108_as_final=2E?=
Message-ID: <3Y3fsr1N41zRZZ@mail.python.org>

http://hg.python.org/peps/rev/ef6e2390fb67
changeset:   4588:ef6e2390fb67
user:        Brett Cannon <brett at python.org>
date:        Sat Nov 17 10:11:16 2012 -0500
summary:
  Mark PEP 3108 as final.

files:
  pep-3108.txt |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/pep-3108.txt b/pep-3108.txt
--- a/pep-3108.txt
+++ b/pep-3108.txt
@@ -3,13 +3,17 @@
 Version: $Revision$
 Last-Modified: $Date$
 Author: Brett Cannon <brett at python.org>
-Status: Accepted
+Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 01-Jan-2007
 Python-Version: 3.0
 Post-History: 28-Apr-2008
 
+.. note::
+   The merging of profile/cProfile as of Python 3.3 did not
+   occur, and thus is considered abandoned (although it would be
+   acceptable to do in the future).
 
 Abstract
 ========

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

From python-checkins at python.org  Sat Nov 17 16:39:24 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 16:39:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NDIwOiBkb2N1?=
 =?utf-8?q?ment_a_way_to_escape_metacharacters_in_glob/fnmatch=2E?=
Message-ID: <3Y3gTm67B2zRdm@mail.python.org>

http://hg.python.org/cpython/rev/333fe4c4897a
changeset:   80469:333fe4c4897a
branch:      2.7
parent:      80463:770bbc93ae89
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 17:38:11 2012 +0200
summary:
  #16420: document a way to escape metacharacters in glob/fnmatch.

files:
  Doc/library/fnmatch.rst |  5 +++--
  Doc/library/glob.rst    |  3 +++
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -29,6 +29,9 @@
 | ``[!seq]`` | matches any character not in *seq* |
 +------------+------------------------------------+
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 .. index:: module: glob
 
 Note that the filename separator (``'/'`` on Unix) is *not* special to this
@@ -76,8 +79,6 @@
 
    Return the shell-style *pattern* converted to a regular expression.
 
-   Be aware there is no way to quote meta-characters.
-
    Example:
 
       >>> import fnmatch, re
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -19,6 +19,9 @@
 subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 
 .. function:: glob(pathname)
 

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

From python-checkins at python.org  Sat Nov 17 16:39:26 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 16:39:26 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NDIwOiBkb2N1?=
 =?utf-8?q?ment_a_way_to_escape_metacharacters_in_glob/fnmatch=2E?=
Message-ID: <3Y3gTp1FRZzRdr@mail.python.org>

http://hg.python.org/cpython/rev/168f36c2b5ea
changeset:   80470:168f36c2b5ea
branch:      3.2
parent:      80464:120757b34806
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 17:38:11 2012 +0200
summary:
  #16420: document a way to escape metacharacters in glob/fnmatch.

files:
  Doc/library/fnmatch.rst |  5 +++--
  Doc/library/glob.rst    |  3 +++
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -29,6 +29,9 @@
 | ``[!seq]`` | matches any character not in *seq* |
 +------------+------------------------------------+
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 .. index:: module: glob
 
 Note that the filename separator (``'/'`` on Unix) is *not* special to this
@@ -74,8 +77,6 @@
 
    Return the shell-style *pattern* converted to a regular expression.
 
-   Be aware there is no way to quote meta-characters.
-
    Example:
 
       >>> import fnmatch, re
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -19,6 +19,9 @@
 subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 
 .. function:: glob(pathname)
 

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

From python-checkins at python.org  Sat Nov 17 16:39:27 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 16:39:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316420=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y3gTq3RdVzRdw@mail.python.org>

http://hg.python.org/cpython/rev/2208061d863c
changeset:   80471:2208061d863c
branch:      3.3
parent:      80467:358be7742377
parent:      80470:168f36c2b5ea
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 17:38:58 2012 +0200
summary:
  #16420: merge with 3.2.

files:
  Doc/library/fnmatch.rst |  5 +++--
  Doc/library/glob.rst    |  3 +++
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -29,6 +29,9 @@
 | ``[!seq]`` | matches any character not in *seq* |
 +------------+------------------------------------+
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 .. index:: module: glob
 
 Note that the filename separator (``'/'`` on Unix) is *not* special to this
@@ -74,8 +77,6 @@
 
    Return the shell-style *pattern* converted to a regular expression.
 
-   Be aware there is no way to quote meta-characters.
-
    Example:
 
       >>> import fnmatch, re
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -19,6 +19,9 @@
 subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 
 .. function:: glob(pathname)
 

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

From python-checkins at python.org  Sat Nov 17 16:39:28 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 16:39:28 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NDIwOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y3gTr6J4HzRdm@mail.python.org>

http://hg.python.org/cpython/rev/ff6d3fd9d08f
changeset:   80472:ff6d3fd9d08f
parent:      80468:ba1d7447bd1b
parent:      80471:2208061d863c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 17:39:11 2012 +0200
summary:
  #16420: merge with 3.3.

files:
  Doc/library/fnmatch.rst |  5 +++--
  Doc/library/glob.rst    |  3 +++
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -29,6 +29,9 @@
 | ``[!seq]`` | matches any character not in *seq* |
 +------------+------------------------------------+
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 .. index:: module: glob
 
 Note that the filename separator (``'/'`` on Unix) is *not* special to this
@@ -74,8 +77,6 @@
 
    Return the shell-style *pattern* converted to a regular expression.
 
-   Be aware there is no way to quote meta-characters.
-
    Example:
 
       >>> import fnmatch, re
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -19,6 +19,9 @@
 subshell.  (For tilde and shell variable expansion, use
 :func:`os.path.expanduser` and :func:`os.path.expandvars`.)
 
+For a literal match, wrap the meta-characters in brackets.
+For example, ``'[?]'`` matches the character ``'?'``.
+
 
 .. function:: glob(pathname)
 

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

From python-checkins at python.org  Sat Nov 17 17:56:26 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 17:56:26 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2311981=3A_remove_duplica?=
 =?utf-8?q?te_line=2E__Patch_by_Johan_Euphrosine=2E?=
Message-ID: <3Y3jBf68B6zRgY@mail.python.org>

http://hg.python.org/cpython/rev/d51665f9a416
changeset:   80473:d51665f9a416
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 18:56:15 2012 +0200
summary:
  #11981: remove duplicate line.  Patch by Johan Euphrosine.

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


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1391,7 +1391,6 @@
             zinfo.compress_size = len(data)    # Compressed size
         else:
             zinfo.compress_size = zinfo.file_size
-        zinfo.header_offset = self.fp.tell()    # Start of header data
         self.fp.write(zinfo.FileHeader())
         self.fp.write(data)
         self.fp.flush()

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

From python-checkins at python.org  Sat Nov 17 18:31:00 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 18:31:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogIzE2MTU3OiBmaXgg?=
 =?utf-8?q?links_in_the_whatsnew_files=2E?=
Message-ID: <3Y3jyX0cZPzN9n@mail.python.org>

http://hg.python.org/cpython/rev/d6cd283bb4c2
changeset:   80474:d6cd283bb4c2
branch:      3.3
parent:      80471:2208061d863c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 19:29:12 2012 +0200
summary:
  #16157: fix links in the whatsnew files.

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


diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -50,7 +50,7 @@
 
 This article explains the new features in Python 3.2 as compared to 3.1.  It
 focuses on a few highlights and gives a few examples.  For full details, see the
-:source:`Misc/NEWS <Misc/NEWS>` file.
+`Misc/NEWS <http://hg.python.org/cpython/file/3.2/Misc/NEWS>`_ file.
 
 .. seealso::
 
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
@@ -44,7 +44,7 @@
 
 This article explains the new features in Python 3.3, compared to 3.2.
 Python 3.3 was released on September 29, 2012.  For full details,
-see the :source:`Misc/NEWS` file.
+see the `changelog <http://docs.python.org/3.3/whatsnew/changelog.html>`_.
 
 .. seealso::
 

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

From python-checkins at python.org  Sat Nov 17 18:31:01 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 17 Nov 2012 18:31:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MTU3OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y3jyY35Y6zRjy@mail.python.org>

http://hg.python.org/cpython/rev/9a08c9443c54
changeset:   80475:9a08c9443c54
parent:      80473:d51665f9a416
parent:      80474:d6cd283bb4c2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Nov 17 19:30:48 2012 +0200
summary:
  #16157: merge with 3.3.

files:
  Doc/whatsnew/3.2.rst |  2 +-
  Doc/whatsnew/3.3.rst |  2 +-
  Doc/whatsnew/3.4.rst |  3 ++-
  3 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -50,7 +50,7 @@
 
 This article explains the new features in Python 3.2 as compared to 3.1.  It
 focuses on a few highlights and gives a few examples.  For full details, see the
-:source:`Misc/NEWS <Misc/NEWS>` file.
+`Misc/NEWS <http://hg.python.org/cpython/file/3.2/Misc/NEWS>`_ file.
 
 .. seealso::
 
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
@@ -44,7 +44,7 @@
 
 This article explains the new features in Python 3.3, compared to 3.2.
 Python 3.3 was released on September 29, 2012.  For full details,
-see the :source:`Misc/NEWS` file.
+see the `changelog <http://docs.python.org/3.3/whatsnew/changelog.html>`_.
 
 .. seealso::
 
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
@@ -65,7 +65,8 @@
 
 .. Python 3.4 was released on TBD.
 
-For full details, see the :source:`Misc/NEWS` file.
+For full details, see the
+`changelog <http://docs.python.org/3.4/whatsnew/changelog.html>`_.
 
 .. 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

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

From python-checkins at python.org  Sat Nov 17 19:00:01 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 19:00:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2314631=3A_Add_a_ne?=
 =?utf-8?q?w_=3Aclass=3A=60weakref=2EWeakMethod=60_to_simulate_weak_refere?=
 =?utf-8?q?nces?=
Message-ID: <3Y3kc13QnwzRTG@mail.python.org>

http://hg.python.org/cpython/rev/27c20650aeab
changeset:   80476:27c20650aeab
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 18:57:38 2012 +0100
summary:
  Issue #14631: Add a new :class:`weakref.WeakMethod` to simulate weak references to bound methods.

files:
  Doc/library/weakref.rst  |   29 +++++
  Lib/test/test_weakref.py |  140 +++++++++++++++++++++++++++
  Lib/weakref.py           |   56 ++++++++++-
  Misc/NEWS                |    3 +
  4 files changed, 227 insertions(+), 1 deletions(-)


diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst
--- a/Doc/library/weakref.rst
+++ b/Doc/library/weakref.rst
@@ -192,6 +192,35 @@
    discarded when no strong reference to it exists any more.
 
 
+.. class:: WeakMethod(method)
+
+   A custom :class:`ref` subclass which simulates a weak reference to a bound
+   method (i.e., a method defined on a class and looked up on an instance).
+   Since a bound method is ephemeral, a standard weak reference cannot keep
+   hold of it.  :class:`WeakMethod` has special code to recreate the bound
+   method until either the object or the original function dies::
+
+      >>> class C:
+      ...     def method(self):
+      ...         print("method called!")
+      ...
+      >>> c = C()
+      >>> r = weakref.ref(c.method)
+      >>> r()
+      >>> r = weakref.WeakMethod(c.method)
+      >>> r()
+      <bound method C.method of <__main__.C object at 0x7fc859830220>>
+      >>> r()()
+      method called!
+      >>> del c
+      >>> gc.collect()
+      0
+      >>> r()
+      >>>
+
+   .. versionadded:: 3.4
+
+
 .. data:: ReferenceType
 
    The type object for weak references objects.
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -47,6 +47,11 @@
         return NotImplemented
     def __hash__(self):
         return hash(self.arg)
+    def some_method(self):
+        return 4
+    def other_method(self):
+        return 5
+
 
 class RefCycle:
     def __init__(self):
@@ -880,6 +885,140 @@
         self.assertEqual(self.cbcalled, 0)
 
 
+class WeakMethodTestCase(unittest.TestCase):
+
+    def _subclass(self):
+        """Return a Object subclass overriding `some_method`."""
+        class C(Object):
+            def some_method(self):
+                return 6
+        return C
+
+    def test_alive(self):
+        o = Object(1)
+        r = weakref.WeakMethod(o.some_method)
+        self.assertIsInstance(r, weakref.ReferenceType)
+        self.assertIsInstance(r(), type(o.some_method))
+        self.assertIs(r().__self__, o)
+        self.assertIs(r().__func__, o.some_method.__func__)
+        self.assertEqual(r()(), 4)
+
+    def test_object_dead(self):
+        o = Object(1)
+        r = weakref.WeakMethod(o.some_method)
+        del o
+        gc.collect()
+        self.assertIs(r(), None)
+
+    def test_method_dead(self):
+        C = self._subclass()
+        o = C(1)
+        r = weakref.WeakMethod(o.some_method)
+        del C.some_method
+        gc.collect()
+        self.assertIs(r(), None)
+
+    def test_callback_when_object_dead(self):
+        # Test callback behaviour when object dies first.
+        C = self._subclass()
+        calls = []
+        def cb(arg):
+            calls.append(arg)
+        o = C(1)
+        r = weakref.WeakMethod(o.some_method, cb)
+        del o
+        gc.collect()
+        self.assertEqual(calls, [r])
+        # Callback is only called once.
+        C.some_method = Object.some_method
+        gc.collect()
+        self.assertEqual(calls, [r])
+
+    def test_callback_when_method_dead(self):
+        # Test callback behaviour when method dies first.
+        C = self._subclass()
+        calls = []
+        def cb(arg):
+            calls.append(arg)
+        o = C(1)
+        r = weakref.WeakMethod(o.some_method, cb)
+        del C.some_method
+        gc.collect()
+        self.assertEqual(calls, [r])
+        # Callback is only called once.
+        del o
+        gc.collect()
+        self.assertEqual(calls, [r])
+
+    @support.cpython_only
+    def test_no_cycles(self):
+        # A WeakMethod doesn't create any reference cycle to itself.
+        o = Object(1)
+        def cb(_):
+            pass
+        r = weakref.WeakMethod(o.some_method, cb)
+        wr = weakref.ref(r)
+        del r
+        self.assertIs(wr(), None)
+
+    def test_equality(self):
+        def _eq(a, b):
+            self.assertTrue(a == b)
+            self.assertFalse(a != b)
+        def _ne(a, b):
+            self.assertTrue(a != b)
+            self.assertFalse(a == b)
+        x = Object(1)
+        y = Object(1)
+        a = weakref.WeakMethod(x.some_method)
+        b = weakref.WeakMethod(y.some_method)
+        c = weakref.WeakMethod(x.other_method)
+        d = weakref.WeakMethod(y.other_method)
+        # Objects equal, same method
+        _eq(a, b)
+        _eq(c, d)
+        # Objects equal, different method
+        _ne(a, c)
+        _ne(a, d)
+        _ne(b, c)
+        _ne(b, d)
+        # Objects unequal, same or different method
+        z = Object(2)
+        e = weakref.WeakMethod(z.some_method)
+        f = weakref.WeakMethod(z.other_method)
+        _ne(a, e)
+        _ne(a, f)
+        _ne(b, e)
+        _ne(b, f)
+        del x, y, z
+        gc.collect()
+        # Dead WeakMethods compare by identity
+        refs = a, b, c, d, e, f
+        for q in refs:
+            for r in refs:
+                self.assertEqual(q == r, q is r)
+                self.assertEqual(q != r, q is not r)
+
+    def test_hashing(self):
+        # Alive WeakMethods are hashable if the underlying object is
+        # hashable.
+        x = Object(1)
+        y = Object(1)
+        a = weakref.WeakMethod(x.some_method)
+        b = weakref.WeakMethod(y.some_method)
+        c = weakref.WeakMethod(y.other_method)
+        # Since WeakMethod objects are equal, the hashes should be equal.
+        self.assertEqual(hash(a), hash(b))
+        ha = hash(a)
+        # Dead WeakMethods retain their old hash value
+        del x, y
+        gc.collect()
+        self.assertEqual(hash(a), ha)
+        self.assertEqual(hash(b), ha)
+        # If it wasn't hashed when alive, a dead WeakMethod cannot be hashed.
+        self.assertRaises(TypeError, hash, c)
+
+
 class MappingTestCase(TestBase):
 
     COUNT = 10
@@ -1455,6 +1594,7 @@
 def test_main():
     support.run_unittest(
         ReferencesTestCase,
+        WeakMethodTestCase,
         MappingTestCase,
         WeakValueDictionaryTestCase,
         WeakKeyDictionaryTestCase,
diff --git a/Lib/weakref.py b/Lib/weakref.py
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -27,7 +27,61 @@
 __all__ = ["ref", "proxy", "getweakrefcount", "getweakrefs",
            "WeakKeyDictionary", "ReferenceType", "ProxyType",
            "CallableProxyType", "ProxyTypes", "WeakValueDictionary",
-           "WeakSet"]
+           "WeakSet", "WeakMethod"]
+
+
+class WeakMethod(ref):
+    """
+    A custom `weakref.ref` subclass which simulates a weak reference to
+    a bound method, working around the lifetime problem of bound methods.
+    """
+
+    __slots__ = "_func_ref", "_meth_type", "_alive", "__weakref__"
+
+    def __new__(cls, meth, callback=None):
+        try:
+            obj = meth.__self__
+            func = meth.__func__
+        except AttributeError:
+            raise TypeError("argument should be a bound method, not {}"
+                            .format(type(meth))) from None
+        def _cb(arg):
+            # The self-weakref trick is needed to avoid creating a reference
+            # cycle.
+            self = self_wr()
+            if self._alive:
+                self._alive = False
+                if callback is not None:
+                    callback(self)
+        self = ref.__new__(cls, obj, _cb)
+        self._func_ref = ref(func, _cb)
+        self._meth_type = type(meth)
+        self._alive = True
+        self_wr = ref(self)
+        return self
+
+    def __call__(self):
+        obj = super().__call__()
+        func = self._func_ref()
+        if obj is None or func is None:
+            return None
+        return self._meth_type(func, obj)
+
+    def __eq__(self, other):
+        if isinstance(other, WeakMethod):
+            if not self._alive or not other._alive:
+                return self is other
+            return ref.__eq__(self, other) and self._func_ref == other._func_ref
+        return False
+
+    def __ne__(self, other):
+        if isinstance(other, WeakMethod):
+            if not self._alive or not other._alive:
+                return self is not other
+            return ref.__ne__(self, other) or self._func_ref != other._func_ref
+        return True
+
+    __hash__ = ref.__hash__
 
 
 class WeakValueDictionary(collections.MutableMapping):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,9 @@
 Library
 -------
 
+- Issue #14631: Add a new :class:`weakref.WeakMethod` to simulate weak
+  references to bound methods.
+
 - Issue #16469: Fix exceptions from float -> Fraction and Decimal -> Fraction
   conversions for special values to be consistent with those for float -> int
   and Decimal -> int.  Patch by Alexey Kachayev.

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

From python-checkins at python.org  Sat Nov 17 20:18:29 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sat, 17 Nov 2012 20:18:29 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316451=3A_Refactor?=
 =?utf-8?q?_to_remove_duplication_between_range_and_slice_in_slice?=
Message-ID: <3Y3mLY3yYrzRnF@mail.python.org>

http://hg.python.org/cpython/rev/e9af9b1ca67e
changeset:   80477:e9af9b1ca67e
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Nov 17 19:18:10 2012 +0000
summary:
  Issue #16451: Refactor to remove duplication between range and slice in slice index computations.

files:
  Include/sliceobject.h |    3 +
  Objects/rangeobject.c |  205 +-----------------------------
  Objects/sliceobject.c |  148 +++++++++++----------
  3 files changed, 87 insertions(+), 269 deletions(-)


diff --git a/Include/sliceobject.h b/Include/sliceobject.h
--- a/Include/sliceobject.h
+++ b/Include/sliceobject.h
@@ -34,6 +34,9 @@
                                   PyObject* step);
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop);
+PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length,
+                                 PyObject **start_ptr, PyObject **stop_ptr,
+                                 PyObject **step_ptr);
 #endif
 PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length,
                                   Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -318,195 +318,6 @@
     return res;
 }
 
-/* Additional helpers, since the standard slice helpers
- * all clip to PY_SSIZE_T_MAX
- */
-
-/* Replace _PyEval_SliceIndex */
-static PyObject *
-compute_slice_element(PyObject *obj)
-{
-    PyObject *result = NULL;
-    if (obj != NULL) {
-        if (PyIndex_Check(obj)) {
-            result = PyNumber_Index(obj);
-        }
-        else {
-            PyErr_SetString(PyExc_TypeError,
-                            "slice indices must be integers or "
-                            "None or have an __index__ method");
-        }
-    }
-    return result;
-}
-
-/* Replace PySlice_GetIndicesEx
- *   Result indicates whether or not the slice is empty
- *    (-1 = error, 0 = empty slice, 1 = slice contains elements)
- */
-static int
-compute_slice_indices(rangeobject *r, PySliceObject *slice,
-                      PyObject **start, PyObject **stop, PyObject **step)
-{
-    int cmp_result, has_elements;
-    Py_ssize_t clamped_step = 0;
-    PyObject *zero = NULL, *one = NULL, *neg_one = NULL, *candidate = NULL;
-    PyObject *tmp_start = NULL, *tmp_stop = NULL, *tmp_step = NULL;
-    zero = PyLong_FromLong(0);
-    if (zero == NULL) goto Fail;
-    one = PyLong_FromLong(1);
-    if (one == NULL) goto Fail;
-    neg_one = PyLong_FromLong(-1);
-    if (neg_one == NULL) goto Fail;
-
-    /* Calculate step value */
-    if (slice->step == Py_None) {
-        clamped_step = 1;
-        tmp_step = one;
-        Py_INCREF(tmp_step);
-    } else {
-        if (!_PyEval_SliceIndex(slice->step, &clamped_step)) goto Fail;
-        if (clamped_step == 0) {
-            PyErr_SetString(PyExc_ValueError,
-                            "slice step cannot be zero");
-            goto Fail;
-        }
-        tmp_step = compute_slice_element(slice->step);
-        if (tmp_step == NULL) goto Fail;
-    }
-
-    /* Calculate start value */
-    if (slice->start == Py_None) {
-        if (clamped_step < 0) {
-            tmp_start = PyNumber_Subtract(r->length, one);
-            if (tmp_start == NULL) goto Fail;
-        } else {
-            tmp_start = zero;
-            Py_INCREF(tmp_start);
-        }
-    } else {
-        candidate = compute_slice_element(slice->start);
-        if (candidate == NULL) goto Fail;
-        cmp_result = PyObject_RichCompareBool(candidate, zero, Py_LT);
-        if (cmp_result == -1) goto Fail;
-        if (cmp_result) {
-            /* candidate < 0 */
-            tmp_start = PyNumber_Add(r->length, candidate);
-            if (tmp_start == NULL) goto Fail;
-            Py_CLEAR(candidate);
-        } else {
-            /* candidate >= 0 */
-            tmp_start = candidate;
-            candidate = NULL;
-        }
-        cmp_result = PyObject_RichCompareBool(tmp_start, zero, Py_LT);
-        if (cmp_result == -1) goto Fail;
-        if (cmp_result) {
-            /* tmp_start < 0 */
-            Py_CLEAR(tmp_start);
-            if (clamped_step < 0) {
-                tmp_start = neg_one;
-            } else {
-                tmp_start = zero;
-            }
-            Py_INCREF(tmp_start);
-        } else {
-            /* tmp_start >= 0 */
-            cmp_result = PyObject_RichCompareBool(tmp_start, r->length, Py_GE);
-            if (cmp_result == -1) goto Fail;
-            if (cmp_result) {
-                /* tmp_start >= r->length */
-                Py_CLEAR(tmp_start);
-                if (clamped_step < 0) {
-                    tmp_start = PyNumber_Subtract(r->length, one);
-                    if (tmp_start == NULL) goto Fail;
-                } else {
-                    tmp_start = r->length;
-                    Py_INCREF(tmp_start);
-                }
-            }
-        }
-    }
-
-    /* Calculate stop value */
-    if (slice->stop == Py_None) {
-        if (clamped_step < 0) {
-            tmp_stop = neg_one;
-        } else {
-            tmp_stop = r->length;
-        }
-        Py_INCREF(tmp_stop);
-    } else {
-        candidate = compute_slice_element(slice->stop);
-        if (candidate == NULL) goto Fail;
-        cmp_result = PyObject_RichCompareBool(candidate, zero, Py_LT);
-        if (cmp_result == -1) goto Fail;
-        if (cmp_result) {
-            /* candidate < 0 */
-            tmp_stop = PyNumber_Add(r->length, candidate);
-            if (tmp_stop == NULL) goto Fail;
-            Py_CLEAR(candidate);
-        } else {
-            /* candidate >= 0 */
-            tmp_stop = candidate;
-            candidate = NULL;
-        }
-        cmp_result = PyObject_RichCompareBool(tmp_stop, zero, Py_LT);
-        if (cmp_result == -1) goto Fail;
-        if (cmp_result) {
-            /* tmp_stop < 0 */
-            Py_CLEAR(tmp_stop);
-            if (clamped_step < 0) {
-                tmp_stop = neg_one;
-            } else {
-                tmp_stop = zero;
-            }
-            Py_INCREF(tmp_stop);
-        } else {
-            /* tmp_stop >= 0 */
-            cmp_result = PyObject_RichCompareBool(tmp_stop, r->length, Py_GE);
-            if (cmp_result == -1) goto Fail;
-            if (cmp_result) {
-                /* tmp_stop >= r->length */
-                Py_CLEAR(tmp_stop);
-                if (clamped_step < 0) {
-                    tmp_stop = PyNumber_Subtract(r->length, one);
-                    if (tmp_stop == NULL) goto Fail;
-                } else {
-                    tmp_stop = r->length;
-                    Py_INCREF(tmp_stop);
-                }
-            }
-        }
-    }
-
-    /* Check if the slice is empty or not */
-    if (clamped_step < 0) {
-        has_elements = PyObject_RichCompareBool(tmp_start, tmp_stop, Py_GT);
-    } else {
-        has_elements = PyObject_RichCompareBool(tmp_start, tmp_stop, Py_LT);
-    }
-    if (has_elements == -1) goto Fail;
-
-    *start = tmp_start;
-    *stop = tmp_stop;
-    *step = tmp_step;
-    Py_DECREF(neg_one);
-    Py_DECREF(one);
-    Py_DECREF(zero);
-    return has_elements;
-
-  Fail:
-    Py_XDECREF(tmp_start);
-    Py_XDECREF(tmp_stop);
-    Py_XDECREF(tmp_step);
-    Py_XDECREF(candidate);
-    Py_XDECREF(neg_one);
-    Py_XDECREF(one);
-    Py_XDECREF(zero);
-    return -1;
-}
-
 static PyObject *
 compute_slice(rangeobject *r, PyObject *_slice)
 {
@@ -514,10 +325,11 @@
     rangeobject *result;
     PyObject *start = NULL, *stop = NULL, *step = NULL;
     PyObject *substart = NULL, *substop = NULL, *substep = NULL;
-    int has_elements;
+    int error;
 
-    has_elements = compute_slice_indices(r, slice, &start, &stop, &step);
-    if (has_elements == -1) return NULL;
+    error = _PySlice_GetLongIndices(slice, r->length, &start, &stop, &step);
+    if (error == -1)
+        return NULL;
 
     substep = PyNumber_Multiply(r->step, step);
     if (substep == NULL) goto fail;
@@ -527,13 +339,8 @@
     if (substart == NULL) goto fail;
     Py_CLEAR(start);
 
-    if (has_elements) {
-        substop = compute_item(r, stop);
-        if (substop == NULL) goto fail;
-    } else {
-        substop = substart;
-        Py_INCREF(substop);
-    }
+    substop = compute_item(r, stop);
+    if (substop == NULL) goto fail;
     Py_CLEAR(stop);
 
     result = make_range_object(Py_TYPE(r), substart, substop, substep);
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -316,57 +316,41 @@
     }
 }
 
-/* Implementation of slice.indices. */
+/* Compute slice indices given a slice and length.  Return -1 on failure.  Used
+   by slice.indices and rangeobject slicing.  Assumes that `len` is a
+   nonnegative instance of PyLong. */
 
-static PyObject*
-slice_indices(PySliceObject* self, PyObject* len)
+int
+_PySlice_GetLongIndices(PySliceObject *self, PyObject *length,
+                        PyObject **start_ptr, PyObject **stop_ptr,
+                        PyObject **step_ptr)
 {
     PyObject *start=NULL, *stop=NULL, *step=NULL;
-    PyObject *length=NULL, *upper=NULL, *lower=NULL, *zero=NULL;
-    int step_is_negative, cmp;
+    PyObject *upper=NULL, *lower=NULL;
+    int step_is_negative, cmp_result;
 
-    zero = PyLong_FromLong(0L);
-    if (zero == NULL)
-        return NULL;
-
-    /* Compute step and length as integers. */
-    length = PyNumber_Index(len);
-    if (length == NULL)
-        goto error;
-
-    if (self->step == Py_None)
+    /* Convert step to an integer; raise for zero step. */
+    if (self->step == Py_None) {
         step = PyLong_FromLong(1L);
-    else
+        if (step == NULL)
+            goto error;
+        step_is_negative = 0;
+    }
+    else {
+        int step_sign;
         step = evaluate_slice_index(self->step);
-    if (step == NULL)
-        goto error;
-
-    /* Raise ValueError for negative length or zero step. */
-    cmp = PyObject_RichCompareBool(length, zero, Py_LT);
-    if (cmp < 0) {
-        goto error;
-    }
-    if (cmp) {
-        PyErr_SetString(PyExc_ValueError,
-                        "length should not be negative");
-        goto error;
-    }
-
-    cmp = PyObject_RichCompareBool(step, zero, Py_EQ);
-    if (cmp < 0) {
-        goto error;
-    }
-    if (cmp) {
-        PyErr_SetString(PyExc_ValueError,
-                        "slice step cannot be zero");
-        goto error;
+        if (step == NULL)
+            goto error;
+        step_sign = _PyLong_Sign(step);
+        if (step_sign == 0) {
+            PyErr_SetString(PyExc_ValueError,
+                            "slice step cannot be zero");
+            goto error;
+        }
+        step_is_negative = step_sign < 0;
     }
 
     /* Find lower and upper bounds for start and stop. */
-    step_is_negative = PyObject_RichCompareBool(step, zero, Py_LT);
-    if (step_is_negative < 0) {
-        goto error;
-    }
     if (step_is_negative) {
         lower = PyLong_FromLong(-1L);
         if (lower == NULL)
@@ -377,8 +361,10 @@
             goto error;
     }
     else {
-        lower = zero;
-        Py_INCREF(lower);
+        lower = PyLong_FromLong(0L);
+        if (lower == NULL)
+            goto error;
+
         upper = length;
         Py_INCREF(upper);
     }
@@ -393,10 +379,7 @@
         if (start == NULL)
             goto error;
 
-        cmp = PyObject_RichCompareBool(start, zero, Py_LT);
-        if (cmp < 0)
-            goto error;
-        if (cmp) {
+        if (_PyLong_Sign(start) < 0) {
             /* start += length */
             PyObject *tmp = PyNumber_Add(start, length);
             Py_DECREF(start);
@@ -404,20 +387,20 @@
             if (start == NULL)
                 goto error;
 
-            cmp = PyObject_RichCompareBool(start, lower, Py_LT);
-            if (cmp < 0)
+            cmp_result = PyObject_RichCompareBool(start, lower, Py_LT);
+            if (cmp_result < 0)
                 goto error;
-            if (cmp) {
+            if (cmp_result) {
                 Py_INCREF(lower);
                 Py_DECREF(start);
                 start = lower;
             }
         }
         else {
-            cmp = PyObject_RichCompareBool(start, upper, Py_GT);
-            if (cmp < 0)
+            cmp_result = PyObject_RichCompareBool(start, upper, Py_GT);
+            if (cmp_result < 0)
                 goto error;
-            if (cmp) {
+            if (cmp_result) {
                 Py_INCREF(upper);
                 Py_DECREF(start);
                 start = upper;
@@ -435,10 +418,7 @@
         if (stop == NULL)
             goto error;
 
-        cmp = PyObject_RichCompareBool(stop, zero, Py_LT);
-        if (cmp < 0)
-            goto error;
-        if (cmp) {
+        if (_PyLong_Sign(stop) < 0) {
             /* stop += length */
             PyObject *tmp = PyNumber_Add(stop, length);
             Py_DECREF(stop);
@@ -446,20 +426,20 @@
             if (stop == NULL)
                 goto error;
 
-            cmp = PyObject_RichCompareBool(stop, lower, Py_LT);
-            if (cmp < 0)
+            cmp_result = PyObject_RichCompareBool(stop, lower, Py_LT);
+            if (cmp_result < 0)
                 goto error;
-            if (cmp) {
+            if (cmp_result) {
                 Py_INCREF(lower);
                 Py_DECREF(stop);
                 stop = lower;
             }
         }
         else {
-            cmp = PyObject_RichCompareBool(stop, upper, Py_GT);
-            if (cmp < 0)
+            cmp_result = PyObject_RichCompareBool(stop, upper, Py_GT);
+            if (cmp_result < 0)
                 goto error;
-            if (cmp) {
+            if (cmp_result) {
                 Py_INCREF(upper);
                 Py_DECREF(stop);
                 stop = upper;
@@ -467,23 +447,51 @@
         }
     }
 
+    *start_ptr = start;
+    *stop_ptr = stop;
+    *step_ptr = step;
     Py_DECREF(upper);
     Py_DECREF(lower);
-    Py_DECREF(length);
-    Py_DECREF(zero);
-    return Py_BuildValue("(NNN)", start, stop, step);
+    return 0;
 
   error:
+    *start_ptr = *stop_ptr = *step_ptr = NULL;
     Py_XDECREF(start);
     Py_XDECREF(stop);
     Py_XDECREF(step);
     Py_XDECREF(upper);
     Py_XDECREF(lower);
-    Py_XDECREF(length);
-    Py_XDECREF(zero);
-    return NULL;
+    return -1;
 }
 
+/* Implementation of slice.indices. */
+
+static PyObject*
+slice_indices(PySliceObject* self, PyObject* len)
+{
+    PyObject *start, *stop, *step;
+    PyObject *length;
+    int error;
+
+    /* Convert length to an integer if necessary; raise for negative length. */
+    length = PyNumber_Index(len);
+    if (length == NULL)
+        return NULL;
+
+    if (_PyLong_Sign(length) < 0) {
+        PyErr_SetString(PyExc_ValueError,
+                        "length should not be negative");
+        Py_DECREF(length);
+        return NULL;
+    }
+
+    error = _PySlice_GetLongIndices(self, length, &start, &stop, &step);
+    Py_DECREF(length);
+    if (error == -1)
+        return NULL;
+    else
+        return Py_BuildValue("(NNN)", start, stop, step);
+}
 
 PyDoc_STRVAR(slice_indices_doc,
 "S.indices(len) -> (start, stop, stride)\n\

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

From python-checkins at python.org  Sat Nov 17 21:17:15 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 21:17:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1Mzc5?=
 =?utf-8?q?=3A_Fix_passing_of_non-BMP_characters_as_integers_for_the_charm?=
 =?utf-8?q?ap?=
Message-ID: <3Y3nfM6kj5zRlM@mail.python.org>

http://hg.python.org/cpython/rev/c7ce91756472
changeset:   80478:c7ce91756472
branch:      2.7
parent:      80469:333fe4c4897a
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 21:14:58 2012 +0100
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
@@ -717,7 +717,7 @@
                 raise ValueError
         self.assertRaises(UnicodeError, codecs.charmap_decode, "\xff", "strict", {0xff: None})
         self.assertRaises(ValueError, codecs.charmap_decode, "\xff", "strict", D())
-        self.assertRaises(TypeError, codecs.charmap_decode, "\xff", "strict", {0xff: sys.maxunicode+1})
+        self.assertRaises(TypeError, codecs.charmap_decode, "\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
@@ -1534,6 +1534,10 @@
             (u"ab", 3)
         )
 
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict", u"ab"
+        )
+
         self.assertEqual(
             codecs.charmap_decode("\x00\x01\x02", "ignore", u"ab\ufffe"),
             (u"ab", 3)
@@ -1545,6 +1549,107 @@
             (u"", len(allbytes))
         )
 
+    def test_decode_with_int2str_map(self):
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "strict",
+                                  {0: u'a', 1: u'b', 2: u'c'}),
+            (u"abc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "strict",
+                                  {0: u'Aa', 1: u'Bb', 2: u'Cc'}),
+            (u"AaBbCc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "strict",
+                                  {0: u'\U0010FFFF', 1: u'b', 2: u'c'}),
+            (u"\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "strict",
+                                  {0: u'a', 1: u'b', 2: u''}),
+            (u"ab", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, "\x00\x01\x02", "strict",
+                                   {0: u'a', 1: u'b'}
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "replace",
+                                  {0: u'a', 1: u'b'}),
+            (u"ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "replace",
+                                  {0: u'a', 1: u'b', 2: None}),
+            (u"ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "ignore",
+                                  {0: u'a', 1: u'b'}),
+            (u"ab", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "ignore",
+                                  {0: u'a', 1: u'b', 2: None}),
+            (u"ab", 3)
+        )
+
+        allbytes = bytes(range(256))
+        self.assertEqual(
+            codecs.charmap_decode(allbytes, "ignore", {}),
+            (u"", len(allbytes))
+        )
+
+    def test_decode_with_int2int_map(self):
+        a = ord(u'a')
+        b = ord(u'b')
+        c = ord(u'c')
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "strict",
+                                  {0: a, 1: b, 2: c}),
+            (u"abc", 3)
+        )
+
+        # Issue #15379
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "strict",
+                                  {0: 0x10FFFF, 1: b, 2: c}),
+            (u"\U0010FFFFbc", 3)
+        )
+
+        self.assertRaises(TypeError,
+            codecs.charmap_decode, "\x00\x01\x02", "strict",
+                                   {0: 0x110000, 1: b, 2: c}
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, "\x00\x01\x02", "strict",
+                                   {0: a, 1: b},
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "replace",
+                                  {0: a, 1: b}),
+            (u"ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode("\x00\x01\x02", "ignore",
+                                  {0: a, 1: b}),
+            (u"ab", 3)
+        )
+
+
 class WithStmtTest(unittest.TestCase):
     def test_encodedfile(self):
         f = StringIO.StringIO("\xc3\xbc")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,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 #16453: Fix equality testing of dead weakref objects.
 
 - Issue #9535: Fix pending signals that have been received but not yet
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4127,12 +4127,36 @@
             /* Apply mapping */
             if (PyInt_Check(x)) {
                 long value = PyInt_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  Sat Nov 17 21:19:01 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sat, 17 Nov 2012 21:19:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzk3NDI6?=
 =?utf-8?q?_Sneaky_fix_for_build_failure_on_Solaris_9=2E?=
Message-ID: <3Y3nhP0Kt2zRmc@mail.python.org>

http://hg.python.org/cpython/rev/ff300ccd119d
changeset:   80479:ff300ccd119d
branch:      2.7
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Nov 17 20:18:52 2012 +0000
summary:
  Issue #9742: Sneaky fix for build failure on Solaris 9.

files:
  Objects/floatobject.c |  9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Objects/floatobject.c b/Objects/floatobject.c
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1088,6 +1088,15 @@
     PyObject *result = NULL;
     _Py_SET_53BIT_PRECISION_HEADER;
 
+    /* Easy path for the common case ndigits == 0. */
+    if (ndigits == 0) {
+        rounded = round(x);
+        if (fabs(rounded - x) == 0.5)
+            /* halfway between two integers; use round-away-from-zero */
+            rounded = x + (x > 0.0 ? 0.5 : -0.5);
+        return PyFloat_FromDouble(rounded);
+    }
+
     /* The basic idea is very simple: convert and round the double to a
        decimal string using _Py_dg_dtoa, then convert that decimal string
        back to a double with _Py_dg_strtod.  There's one minor difficulty:

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

From python-checkins at python.org  Sat Nov 17 23:30:52 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 23:30:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MjE1?=
 =?utf-8?q?=3A_Fix_potential_double_memory_free_in_str=2Ereplace=28=29=2E?=
Message-ID: <3Y3rcX0FyfzRmN@mail.python.org>

http://hg.python.org/cpython/rev/26e5234239ae
changeset:   80480:26e5234239ae
branch:      3.3
parent:      80474:d6cd283bb4c2
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 23:28:17 2012 +0100
summary:
  Issue #16215: Fix potential double memory free in str.replace().
Patch by Serhiy Storchaka.

files:
  Misc/NEWS               |  3 +++
  Objects/unicodeobject.c |  2 ++
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16215: Fix potential double memory free in str.replace().  Patch
+  by Serhiy Storchaka.
+
 - Issue #16453: Fix equality testing of dead weakref objects.
 
 - Issue #9535: Fix pending signals that have been received but not yet
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -10118,6 +10118,7 @@
                 /* widen self and buf1 */
                 rkind = kind2;
                 if (release1) PyMem_Free(buf1);
+                release1 = 0;
                 sbuf = _PyUnicode_AsKind(self, rkind);
                 if (!sbuf) goto error;
                 srelease = 1;
@@ -10179,6 +10180,7 @@
             if (!sbuf) goto error;
             srelease = 1;
             if (release1) PyMem_Free(buf1);
+            release1 = 0;
             buf1 = _PyUnicode_AsKind(str1, rkind);
             if (!buf1) goto error;
             release1 = 1;

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

From python-checkins at python.org  Sat Nov 17 23:30:54 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 23:30:54 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316215=3A_Fix_potential_double_memory_free_in_st?=
 =?utf-8?b?ci5yZXBsYWNlKCku?=
Message-ID: <3Y3rcZ0N5CzRnr@mail.python.org>

http://hg.python.org/cpython/rev/5f2624db78bd
changeset:   80481:5f2624db78bd
parent:      80477:e9af9b1ca67e
parent:      80480:26e5234239ae
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 23:29:28 2012 +0100
summary:
  Issue #16215: Fix potential double memory free in str.replace().
Patch by Serhiy Storchaka.

files:
  Misc/NEWS               |  3 +++
  Objects/unicodeobject.c |  2 ++
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16215: Fix potential double memory free in str.replace().  Patch
+  by Serhiy Storchaka.
+
 - Issue #16290: A float return value from the __complex__ special method is no
   longer accepted in the complex() constructor.
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9959,6 +9959,7 @@
                 /* widen self and buf1 */
                 rkind = kind2;
                 if (release1) PyMem_Free(buf1);
+                release1 = 0;
                 sbuf = _PyUnicode_AsKind(self, rkind);
                 if (!sbuf) goto error;
                 srelease = 1;
@@ -10020,6 +10021,7 @@
             if (!sbuf) goto error;
             srelease = 1;
             if (release1) PyMem_Free(buf1);
+            release1 = 0;
             buf1 = _PyUnicode_AsKind(str1, rkind);
             if (!buf1) goto error;
             release1 = 1;

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

From python-checkins at python.org  Sat Nov 17 23:56:10 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 23:56:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDA4?=
 =?utf-8?q?=3A_Fix_file_descriptors_not_being_closed_in_error_conditions_i?=
 =?utf-8?q?n_the?=
Message-ID: <3Y3s9k5PCpzRmV@mail.python.org>

http://hg.python.org/cpython/rev/d51d95c9ea81
changeset:   80482:d51d95c9ea81
branch:      3.2
parent:      80470:168f36c2b5ea
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 23:50:08 2012 +0100
summary:
  Issue #16408: Fix file descriptors not being closed in error conditions in the zipfile module.
Patch by Serhiy Storchaka.

files:
  Lib/zipfile.py |  407 +++++++++++++++++-------------------
  Misc/NEWS      |    3 +
  2 files changed, 198 insertions(+), 212 deletions(-)


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -719,30 +719,34 @@
             self.fp = file
             self.filename = getattr(file, 'name', None)
 
-        if key == 'r':
-            self._GetContents()
-        elif key == 'w':
-            # set the modified flag so central directory gets written
-            # even if no files are added to the archive
-            self._didModify = True
-        elif key == 'a':
-            try:
-                # See if file is a zip file
+        try:
+            if key == 'r':
                 self._RealGetContents()
-                # seek to start of directory and overwrite
-                self.fp.seek(self.start_dir, 0)
-            except BadZipFile:
-                # file is not a zip file, just append
-                self.fp.seek(0, 2)
-
+            elif key == 'w':
                 # set the modified flag so central directory gets written
                 # even if no files are added to the archive
                 self._didModify = True
-        else:
+            elif key == 'a':
+                try:
+                    # See if file is a zip file
+                    self._RealGetContents()
+                    # seek to start of directory and overwrite
+                    self.fp.seek(self.start_dir, 0)
+                except BadZipFile:
+                    # file is not a zip file, just append
+                    self.fp.seek(0, 2)
+
+                    # set the modified flag so central directory gets written
+                    # even if no files are added to the archive
+                    self._didModify = True
+            else:
+                raise RuntimeError('Mode must be "r", "w" or "a"')
+        except:
+            fp = self.fp
+            self.fp = None
             if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise RuntimeError('Mode must be "r", "w" or "a"')
+                fp.close()
+            raise
 
     def __enter__(self):
         return self
@@ -750,17 +754,6 @@
     def __exit__(self, type, value, traceback):
         self.close()
 
-    def _GetContents(self):
-        """Read the directory, making sure we close the file if the format
-        is bad."""
-        try:
-            self._RealGetContents()
-        except BadZipFile:
-            if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise
-
     def _RealGetContents(self):
         """Read in the table of contents for the ZIP file."""
         fp = self.fp
@@ -862,9 +855,9 @@
             try:
                 # Read by chunks, to avoid an OverflowError or a
                 # MemoryError with very large embedded files.
-                f = self.open(zinfo.filename, "r")
-                while f.read(chunk_size):     # Check CRC-32
-                    pass
+                with self.open(zinfo.filename, "r") as f:
+                    while f.read(chunk_size):     # Check CRC-32
+                        pass
             except BadZipFile:
                 return zinfo.filename
 
@@ -926,76 +919,70 @@
         else:
             zef_file = io.open(self.filename, 'rb')
 
-        # Make sure we have an info object
-        if isinstance(name, ZipInfo):
-            # 'name' is already an info object
-            zinfo = name
-        else:
-            # Get info object for name
-            try:
+        try:
+            # Make sure we have an info object
+            if isinstance(name, ZipInfo):
+                # 'name' is already an info object
+                zinfo = name
+            else:
+                # Get info object for name
                 zinfo = self.getinfo(name)
-            except KeyError:
-                if not self._filePassed:
-                    zef_file.close()
-                raise
-        zef_file.seek(zinfo.header_offset, 0)
+            zef_file.seek(zinfo.header_offset, 0)
 
-        # Skip the file header:
-        fheader = zef_file.read(sizeFileHeader)
-        if fheader[0:4] != stringFileHeader:
-            raise BadZipFile("Bad magic number for file header")
+            # Skip the file header:
+            fheader = zef_file.read(sizeFileHeader)
+            if fheader[0:4] != stringFileHeader:
+                raise BadZipFile("Bad magic number for file header")
 
-        fheader = struct.unpack(structFileHeader, fheader)
-        fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
-        if fheader[_FH_EXTRA_FIELD_LENGTH]:
-            zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
+            fheader = struct.unpack(structFileHeader, fheader)
+            fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
+            if fheader[_FH_EXTRA_FIELD_LENGTH]:
+                zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
 
-        if zinfo.flag_bits & 0x800:
-            # UTF-8 filename
-            fname_str = fname.decode("utf-8")
-        else:
-            fname_str = fname.decode("cp437")
+            if zinfo.flag_bits & 0x800:
+                # UTF-8 filename
+                fname_str = fname.decode("utf-8")
+            else:
+                fname_str = fname.decode("cp437")
 
-        if fname_str != zinfo.orig_filename:
+            if fname_str != zinfo.orig_filename:
+                raise BadZipFile(
+                    'File name in directory %r and header %r differ.'
+                    % (zinfo.orig_filename, fname))
+
+            # check for encrypted flag & handle password
+            is_encrypted = zinfo.flag_bits & 0x1
+            zd = None
+            if is_encrypted:
+                if not pwd:
+                    pwd = self.pwd
+                if not pwd:
+                    raise RuntimeError("File %s is encrypted, password "
+                                       "required for extraction" % name)
+
+                zd = _ZipDecrypter(pwd)
+                # The first 12 bytes in the cypher stream is an encryption header
+                #  used to strengthen the algorithm. The first 11 bytes are
+                #  completely random, while the 12th contains the MSB of the CRC,
+                #  or the MSB of the file time depending on the header type
+                #  and is used to check the correctness of the password.
+                header = zef_file.read(12)
+                h = list(map(zd, header[0:12]))
+                if zinfo.flag_bits & 0x8:
+                    # compare against the file type from extended local headers
+                    check_byte = (zinfo._raw_time >> 8) & 0xff
+                else:
+                    # compare against the CRC otherwise
+                    check_byte = (zinfo.CRC >> 24) & 0xff
+                if h[11] != check_byte:
+                    raise RuntimeError("Bad password for file", name)
+
+            return ZipExtFile(zef_file, mode, zinfo, zd,
+                              close_fileobj=not self._filePassed)
+        except:
             if not self._filePassed:
                 zef_file.close()
-            raise BadZipFile(
-                  'File name in directory %r and header %r differ.'
-                  % (zinfo.orig_filename, fname))
-
-        # check for encrypted flag & handle password
-        is_encrypted = zinfo.flag_bits & 0x1
-        zd = None
-        if is_encrypted:
-            if not pwd:
-                pwd = self.pwd
-            if not pwd:
-                if not self._filePassed:
-                    zef_file.close()
-                raise RuntimeError("File %s is encrypted, "
-                                   "password required for extraction" % name)
-
-            zd = _ZipDecrypter(pwd)
-            # The first 12 bytes in the cypher stream is an encryption header
-            #  used to strengthen the algorithm. The first 11 bytes are
-            #  completely random, while the 12th contains the MSB of the CRC,
-            #  or the MSB of the file time depending on the header type
-            #  and is used to check the correctness of the password.
-            header = zef_file.read(12)
-            h = list(map(zd, header[0:12]))
-            if zinfo.flag_bits & 0x8:
-                # compare against the file type from extended local headers
-                check_byte = (zinfo._raw_time >> 8) & 0xff
-            else:
-                # compare against the CRC otherwise
-                check_byte = (zinfo.CRC >> 24) & 0xff
-            if h[11] != check_byte:
-                if not self._filePassed:
-                    zef_file.close()
-                raise RuntimeError("Bad password for file", name)
-
-        return ZipExtFile(zef_file, mode, zinfo, zd,
-                          close_fileobj=not self._filePassed)
+            raise
 
     def extract(self, member, path=None, pwd=None):
         """Extract a member from the archive to the current working directory,
@@ -1052,11 +1039,9 @@
                 os.mkdir(targetpath)
             return targetpath
 
-        source = self.open(member, pwd=pwd)
-        target = open(targetpath, "wb")
-        shutil.copyfileobj(source, target)
-        source.close()
-        target.close()
+        with self.open(member, pwd=pwd) as source, \
+             open(targetpath, "wb") as target:
+            shutil.copyfileobj(source, target)
 
         return targetpath
 
@@ -1220,101 +1205,103 @@
         if self.fp is None:
             return
 
-        if self.mode in ("w", "a") and self._didModify: # write ending records
-            count = 0
-            pos1 = self.fp.tell()
-            for zinfo in self.filelist:         # write central directory
-                count = count + 1
-                dt = zinfo.date_time
-                dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
-                dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
-                extra = []
-                if zinfo.file_size > ZIP64_LIMIT \
-                        or zinfo.compress_size > ZIP64_LIMIT:
-                    extra.append(zinfo.file_size)
-                    extra.append(zinfo.compress_size)
-                    file_size = 0xffffffff
-                    compress_size = 0xffffffff
-                else:
-                    file_size = zinfo.file_size
-                    compress_size = zinfo.compress_size
+        try:
+            if self.mode in ("w", "a") and self._didModify: # write ending records
+                count = 0
+                pos1 = self.fp.tell()
+                for zinfo in self.filelist:         # write central directory
+                    count = count + 1
+                    dt = zinfo.date_time
+                    dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
+                    dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
+                    extra = []
+                    if zinfo.file_size > ZIP64_LIMIT \
+                            or zinfo.compress_size > ZIP64_LIMIT:
+                        extra.append(zinfo.file_size)
+                        extra.append(zinfo.compress_size)
+                        file_size = 0xffffffff
+                        compress_size = 0xffffffff
+                    else:
+                        file_size = zinfo.file_size
+                        compress_size = zinfo.compress_size
 
-                if zinfo.header_offset > ZIP64_LIMIT:
-                    extra.append(zinfo.header_offset)
-                    header_offset = 0xffffffff
-                else:
-                    header_offset = zinfo.header_offset
+                    if zinfo.header_offset > ZIP64_LIMIT:
+                        extra.append(zinfo.header_offset)
+                        header_offset = 0xffffffff
+                    else:
+                        header_offset = zinfo.header_offset
 
-                extra_data = zinfo.extra
-                if extra:
-                    # Append a ZIP64 field to the extra's
-                    extra_data = struct.pack(
-                            '<HH' + 'Q'*len(extra),
-                            1, 8*len(extra), *extra) + extra_data
+                    extra_data = zinfo.extra
+                    if extra:
+                        # Append a ZIP64 field to the extra's
+                        extra_data = struct.pack(
+                                '<HH' + 'Q'*len(extra),
+                                1, 8*len(extra), *extra) + extra_data
 
-                    extract_version = max(45, zinfo.extract_version)
-                    create_version = max(45, zinfo.create_version)
-                else:
-                    extract_version = zinfo.extract_version
-                    create_version = zinfo.create_version
+                        extract_version = max(45, zinfo.extract_version)
+                        create_version = max(45, zinfo.create_version)
+                    else:
+                        extract_version = zinfo.extract_version
+                        create_version = zinfo.create_version
 
-                try:
-                    filename, flag_bits = zinfo._encodeFilenameFlags()
-                    centdir = struct.pack(structCentralDir,
-                        stringCentralDir, create_version,
-                        zinfo.create_system, extract_version, zinfo.reserved,
-                        flag_bits, zinfo.compress_type, dostime, dosdate,
-                        zinfo.CRC, compress_size, file_size,
-                        len(filename), len(extra_data), len(zinfo.comment),
-                        0, zinfo.internal_attr, zinfo.external_attr,
-                        header_offset)
-                except DeprecationWarning:
-                    print((structCentralDir, stringCentralDir, create_version,
-                        zinfo.create_system, extract_version, zinfo.reserved,
-                        zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
-                        zinfo.CRC, compress_size, file_size,
-                        len(zinfo.filename), len(extra_data), len(zinfo.comment),
-                        0, zinfo.internal_attr, zinfo.external_attr,
-                        header_offset), file=sys.stderr)
-                    raise
-                self.fp.write(centdir)
-                self.fp.write(filename)
-                self.fp.write(extra_data)
-                self.fp.write(zinfo.comment)
+                    try:
+                        filename, flag_bits = zinfo._encodeFilenameFlags()
+                        centdir = struct.pack(structCentralDir,
+                            stringCentralDir, create_version,
+                            zinfo.create_system, extract_version, zinfo.reserved,
+                            flag_bits, zinfo.compress_type, dostime, dosdate,
+                            zinfo.CRC, compress_size, file_size,
+                            len(filename), len(extra_data), len(zinfo.comment),
+                            0, zinfo.internal_attr, zinfo.external_attr,
+                            header_offset)
+                    except DeprecationWarning:
+                        print((structCentralDir, stringCentralDir, create_version,
+                            zinfo.create_system, extract_version, zinfo.reserved,
+                            zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+                            zinfo.CRC, compress_size, file_size,
+                            len(zinfo.filename), len(extra_data), len(zinfo.comment),
+                            0, zinfo.internal_attr, zinfo.external_attr,
+                            header_offset), file=sys.stderr)
+                        raise
+                    self.fp.write(centdir)
+                    self.fp.write(filename)
+                    self.fp.write(extra_data)
+                    self.fp.write(zinfo.comment)
 
-            pos2 = self.fp.tell()
-            # Write end-of-zip-archive record
-            centDirCount = count
-            centDirSize = pos2 - pos1
-            centDirOffset = pos1
-            if (centDirCount >= ZIP_FILECOUNT_LIMIT or
-                centDirOffset > ZIP64_LIMIT or
-                centDirSize > ZIP64_LIMIT):
-                # Need to write the ZIP64 end-of-archive records
-                zip64endrec = struct.pack(
-                        structEndArchive64, stringEndArchive64,
-                        44, 45, 45, 0, 0, centDirCount, centDirCount,
-                        centDirSize, centDirOffset)
-                self.fp.write(zip64endrec)
+                pos2 = self.fp.tell()
+                # Write end-of-zip-archive record
+                centDirCount = count
+                centDirSize = pos2 - pos1
+                centDirOffset = pos1
+                if (centDirCount >= ZIP_FILECOUNT_LIMIT or
+                    centDirOffset > ZIP64_LIMIT or
+                    centDirSize > ZIP64_LIMIT):
+                    # Need to write the ZIP64 end-of-archive records
+                    zip64endrec = struct.pack(
+                            structEndArchive64, stringEndArchive64,
+                            44, 45, 45, 0, 0, centDirCount, centDirCount,
+                            centDirSize, centDirOffset)
+                    self.fp.write(zip64endrec)
 
-                zip64locrec = struct.pack(
-                        structEndArchive64Locator,
-                        stringEndArchive64Locator, 0, pos2, 1)
-                self.fp.write(zip64locrec)
-                centDirCount = min(centDirCount, 0xFFFF)
-                centDirSize = min(centDirSize, 0xFFFFFFFF)
-                centDirOffset = min(centDirOffset, 0xFFFFFFFF)
+                    zip64locrec = struct.pack(
+                            structEndArchive64Locator,
+                            stringEndArchive64Locator, 0, pos2, 1)
+                    self.fp.write(zip64locrec)
+                    centDirCount = min(centDirCount, 0xFFFF)
+                    centDirSize = min(centDirSize, 0xFFFFFFFF)
+                    centDirOffset = min(centDirOffset, 0xFFFFFFFF)
 
-            endrec = struct.pack(structEndArchive, stringEndArchive,
-                                 0, 0, centDirCount, centDirCount,
-                                 centDirSize, centDirOffset, len(self._comment))
-            self.fp.write(endrec)
-            self.fp.write(self._comment)
-            self.fp.flush()
-
-        if not self._filePassed:
-            self.fp.close()
-        self.fp = None
+                endrec = struct.pack(structEndArchive, stringEndArchive,
+                                    0, 0, centDirCount, centDirCount,
+                                    centDirSize, centDirOffset, len(self._comment))
+                self.fp.write(endrec)
+                self.fp.write(self._comment)
+                self.fp.flush()
+        finally:
+            fp = self.fp
+            self.fp = None
+            if not self._filePassed:
+                fp.close()
 
 
 class PyZipFile(ZipFile):
@@ -1481,16 +1468,15 @@
         if len(args) != 2:
             print(USAGE)
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        zf.printdir()
-        zf.close()
+        with ZipFile(args[1], 'r') as zf:
+            zf.printdir()
 
     elif args[0] == '-t':
         if len(args) != 2:
             print(USAGE)
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        badfile = zf.testzip()
+        with ZipFile(args[1], 'r') as zf:
+            badfile = zf.testzip()
         if badfile:
             print("The following enclosed file is corrupted: {!r}".format(badfile))
         print("Done testing")
@@ -1500,20 +1486,19 @@
             print(USAGE)
             sys.exit(1)
 
-        zf = ZipFile(args[1], 'r')
-        out = args[2]
-        for path in zf.namelist():
-            if path.startswith('./'):
-                tgt = os.path.join(out, path[2:])
-            else:
-                tgt = os.path.join(out, path)
+        with ZipFile(args[1], 'r') as zf:
+            out = args[2]
+            for path in zf.namelist():
+                if path.startswith('./'):
+                    tgt = os.path.join(out, path[2:])
+                else:
+                    tgt = os.path.join(out, path)
 
-            tgtdir = os.path.dirname(tgt)
-            if not os.path.exists(tgtdir):
-                os.makedirs(tgtdir)
-            with open(tgt, 'wb') as fp:
-                fp.write(zf.read(path))
-        zf.close()
+                tgtdir = os.path.dirname(tgt)
+                if not os.path.exists(tgtdir):
+                    os.makedirs(tgtdir)
+                with open(tgt, 'wb') as fp:
+                    fp.write(zf.read(path))
 
     elif args[0] == '-c':
         if len(args) < 3:
@@ -1529,11 +1514,9 @@
                             os.path.join(path, nm), os.path.join(zippath, nm))
             # else: ignore
 
-        zf = ZipFile(args[1], 'w', allowZip64=True)
-        for src in args[2:]:
-            addToZip(zf, src, os.path.basename(src))
-
-        zf.close()
+        with ZipFile(args[1], 'w', allowZip64=True) as zf:
+            for src in args[2:]:
+                addToZip(zf, src, os.path.basename(src))
 
 if __name__ == "__main__":
     main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -164,6 +164,9 @@
 Library
 -------
 
+- Issue #16408: Fix file descriptors not being closed in error conditions
+  in the zipfile module.  Patch by Serhiy Storchaka.
+
 - Issue #16140: The subprocess module no longer double closes its child
   subprocess.PIPE parent file descriptors on child error prior to exec().
 

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

From python-checkins at python.org  Sat Nov 17 23:56:12 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 23:56:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2316408=3A_Fix_file_descriptors_not_being_closed_in_err?=
 =?utf-8?q?or_conditions_in_the?=
Message-ID: <3Y3s9m3NhrzRpj@mail.python.org>

http://hg.python.org/cpython/rev/27cb1a3d57c8
changeset:   80483:27cb1a3d57c8
branch:      3.3
parent:      80480:26e5234239ae
parent:      80482:d51d95c9ea81
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 23:52:05 2012 +0100
summary:
  Issue #16408: Fix file descriptors not being closed in error conditions in the zipfile module.
Patch by Serhiy Storchaka.

files:
  Lib/zipfile.py |  425 +++++++++++++++++-------------------
  Misc/NEWS      |    3 +
  2 files changed, 207 insertions(+), 221 deletions(-)


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -906,30 +906,34 @@
             self.fp = file
             self.filename = getattr(file, 'name', None)
 
-        if key == 'r':
-            self._GetContents()
-        elif key == 'w':
-            # set the modified flag so central directory gets written
-            # even if no files are added to the archive
-            self._didModify = True
-        elif key == 'a':
-            try:
-                # See if file is a zip file
+        try:
+            if key == 'r':
                 self._RealGetContents()
-                # seek to start of directory and overwrite
-                self.fp.seek(self.start_dir, 0)
-            except BadZipFile:
-                # file is not a zip file, just append
-                self.fp.seek(0, 2)
-
+            elif key == 'w':
                 # set the modified flag so central directory gets written
                 # even if no files are added to the archive
                 self._didModify = True
-        else:
+            elif key == 'a':
+                try:
+                    # See if file is a zip file
+                    self._RealGetContents()
+                    # seek to start of directory and overwrite
+                    self.fp.seek(self.start_dir, 0)
+                except BadZipFile:
+                    # file is not a zip file, just append
+                    self.fp.seek(0, 2)
+
+                    # set the modified flag so central directory gets written
+                    # even if no files are added to the archive
+                    self._didModify = True
+            else:
+                raise RuntimeError('Mode must be "r", "w" or "a"')
+        except:
+            fp = self.fp
+            self.fp = None
             if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise RuntimeError('Mode must be "r", "w" or "a"')
+                fp.close()
+            raise
 
     def __enter__(self):
         return self
@@ -937,17 +941,6 @@
     def __exit__(self, type, value, traceback):
         self.close()
 
-    def _GetContents(self):
-        """Read the directory, making sure we close the file if the format
-        is bad."""
-        try:
-            self._RealGetContents()
-        except BadZipFile:
-            if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise
-
     def _RealGetContents(self):
         """Read in the table of contents for the ZIP file."""
         fp = self.fp
@@ -1049,9 +1042,9 @@
             try:
                 # Read by chunks, to avoid an OverflowError or a
                 # MemoryError with very large embedded files.
-                f = self.open(zinfo.filename, "r")
-                while f.read(chunk_size):     # Check CRC-32
-                    pass
+                with self.open(zinfo.filename, "r") as f:
+                    while f.read(chunk_size):     # Check CRC-32
+                        pass
             except BadZipFile:
                 return zinfo.filename
 
@@ -1113,84 +1106,78 @@
         else:
             zef_file = io.open(self.filename, 'rb')
 
-        # Make sure we have an info object
-        if isinstance(name, ZipInfo):
-            # 'name' is already an info object
-            zinfo = name
-        else:
-            # Get info object for name
-            try:
+        try:
+            # Make sure we have an info object
+            if isinstance(name, ZipInfo):
+                # 'name' is already an info object
+                zinfo = name
+            else:
+                # Get info object for name
                 zinfo = self.getinfo(name)
-            except KeyError:
-                if not self._filePassed:
-                    zef_file.close()
-                raise
-        zef_file.seek(zinfo.header_offset, 0)
+            zef_file.seek(zinfo.header_offset, 0)
 
-        # Skip the file header:
-        fheader = zef_file.read(sizeFileHeader)
-        if fheader[0:4] != stringFileHeader:
-            raise BadZipFile("Bad magic number for file header")
+            # Skip the file header:
+            fheader = zef_file.read(sizeFileHeader)
+            if fheader[0:4] != stringFileHeader:
+                raise BadZipFile("Bad magic number for file header")
 
-        fheader = struct.unpack(structFileHeader, fheader)
-        fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
-        if fheader[_FH_EXTRA_FIELD_LENGTH]:
-            zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
+            fheader = struct.unpack(structFileHeader, fheader)
+            fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
+            if fheader[_FH_EXTRA_FIELD_LENGTH]:
+                zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
 
-        if zinfo.flag_bits & 0x20:
-            # Zip 2.7: compressed patched data
-            raise NotImplementedError("compressed patched data (flag bit 5)")
+            if zinfo.flag_bits & 0x20:
+                # Zip 2.7: compressed patched data
+                raise NotImplementedError("compressed patched data (flag bit 5)")
 
-        if zinfo.flag_bits & 0x40:
-            # strong encryption
-            raise NotImplementedError("strong encryption (flag bit 6)")
+            if zinfo.flag_bits & 0x40:
+                # strong encryption
+                raise NotImplementedError("strong encryption (flag bit 6)")
 
-        if zinfo.flag_bits & 0x800:
-            # UTF-8 filename
-            fname_str = fname.decode("utf-8")
-        else:
-            fname_str = fname.decode("cp437")
+            if zinfo.flag_bits & 0x800:
+                # UTF-8 filename
+                fname_str = fname.decode("utf-8")
+            else:
+                fname_str = fname.decode("cp437")
 
-        if fname_str != zinfo.orig_filename:
+            if fname_str != zinfo.orig_filename:
+                raise BadZipFile(
+                    'File name in directory %r and header %r differ.'
+                    % (zinfo.orig_filename, fname))
+
+            # check for encrypted flag & handle password
+            is_encrypted = zinfo.flag_bits & 0x1
+            zd = None
+            if is_encrypted:
+                if not pwd:
+                    pwd = self.pwd
+                if not pwd:
+                    raise RuntimeError("File %s is encrypted, password "
+                                       "required for extraction" % name)
+
+                zd = _ZipDecrypter(pwd)
+                # The first 12 bytes in the cypher stream is an encryption header
+                #  used to strengthen the algorithm. The first 11 bytes are
+                #  completely random, while the 12th contains the MSB of the CRC,
+                #  or the MSB of the file time depending on the header type
+                #  and is used to check the correctness of the password.
+                header = zef_file.read(12)
+                h = list(map(zd, header[0:12]))
+                if zinfo.flag_bits & 0x8:
+                    # compare against the file type from extended local headers
+                    check_byte = (zinfo._raw_time >> 8) & 0xff
+                else:
+                    # compare against the CRC otherwise
+                    check_byte = (zinfo.CRC >> 24) & 0xff
+                if h[11] != check_byte:
+                    raise RuntimeError("Bad password for file", name)
+
+            return ZipExtFile(zef_file, mode, zinfo, zd,
+                              close_fileobj=not self._filePassed)
+        except:
             if not self._filePassed:
                 zef_file.close()
-            raise BadZipFile(
-                  'File name in directory %r and header %r differ.'
-                  % (zinfo.orig_filename, fname))
-
-        # check for encrypted flag & handle password
-        is_encrypted = zinfo.flag_bits & 0x1
-        zd = None
-        if is_encrypted:
-            if not pwd:
-                pwd = self.pwd
-            if not pwd:
-                if not self._filePassed:
-                    zef_file.close()
-                raise RuntimeError("File %s is encrypted, "
-                                   "password required for extraction" % name)
-
-            zd = _ZipDecrypter(pwd)
-            # The first 12 bytes in the cypher stream is an encryption header
-            #  used to strengthen the algorithm. The first 11 bytes are
-            #  completely random, while the 12th contains the MSB of the CRC,
-            #  or the MSB of the file time depending on the header type
-            #  and is used to check the correctness of the password.
-            header = zef_file.read(12)
-            h = list(map(zd, header[0:12]))
-            if zinfo.flag_bits & 0x8:
-                # compare against the file type from extended local headers
-                check_byte = (zinfo._raw_time >> 8) & 0xff
-            else:
-                # compare against the CRC otherwise
-                check_byte = (zinfo.CRC >> 24) & 0xff
-            if h[11] != check_byte:
-                if not self._filePassed:
-                    zef_file.close()
-                raise RuntimeError("Bad password for file", name)
-
-        return ZipExtFile(zef_file, mode, zinfo, zd,
-                          close_fileobj=not self._filePassed)
+            raise
 
     def extract(self, member, path=None, pwd=None):
         """Extract a member from the archive to the current working directory,
@@ -1247,11 +1234,9 @@
                 os.mkdir(targetpath)
             return targetpath
 
-        source = self.open(member, pwd=pwd)
-        target = open(targetpath, "wb")
-        shutil.copyfileobj(source, target)
-        source.close()
-        target.close()
+        with self.open(member, pwd=pwd) as source, \
+             open(targetpath, "wb") as target:
+            shutil.copyfileobj(source, target)
 
         return targetpath
 
@@ -1412,105 +1397,107 @@
         if self.fp is None:
             return
 
-        if self.mode in ("w", "a") and self._didModify: # write ending records
-            count = 0
-            pos1 = self.fp.tell()
-            for zinfo in self.filelist:         # write central directory
-                count = count + 1
-                dt = zinfo.date_time
-                dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
-                dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
-                extra = []
-                if zinfo.file_size > ZIP64_LIMIT \
-                        or zinfo.compress_size > ZIP64_LIMIT:
-                    extra.append(zinfo.file_size)
-                    extra.append(zinfo.compress_size)
-                    file_size = 0xffffffff
-                    compress_size = 0xffffffff
-                else:
-                    file_size = zinfo.file_size
-                    compress_size = zinfo.compress_size
+        try:
+            if self.mode in ("w", "a") and self._didModify: # write ending records
+                count = 0
+                pos1 = self.fp.tell()
+                for zinfo in self.filelist:         # write central directory
+                    count = count + 1
+                    dt = zinfo.date_time
+                    dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
+                    dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
+                    extra = []
+                    if zinfo.file_size > ZIP64_LIMIT \
+                            or zinfo.compress_size > ZIP64_LIMIT:
+                        extra.append(zinfo.file_size)
+                        extra.append(zinfo.compress_size)
+                        file_size = 0xffffffff
+                        compress_size = 0xffffffff
+                    else:
+                        file_size = zinfo.file_size
+                        compress_size = zinfo.compress_size
 
-                if zinfo.header_offset > ZIP64_LIMIT:
-                    extra.append(zinfo.header_offset)
-                    header_offset = 0xffffffff
-                else:
-                    header_offset = zinfo.header_offset
+                    if zinfo.header_offset > ZIP64_LIMIT:
+                        extra.append(zinfo.header_offset)
+                        header_offset = 0xffffffff
+                    else:
+                        header_offset = zinfo.header_offset
 
-                extra_data = zinfo.extra
-                min_version = 0
-                if extra:
-                    # Append a ZIP64 field to the extra's
-                    extra_data = struct.pack(
-                            '<HH' + 'Q'*len(extra),
-                            1, 8*len(extra), *extra) + extra_data
+                    extra_data = zinfo.extra
+                    min_version = 0
+                    if extra:
+                        # Append a ZIP64 field to the extra's
+                        extra_data = struct.pack(
+                                '<HH' + 'Q'*len(extra),
+                                1, 8*len(extra), *extra) + extra_data
 
-                    min_version = ZIP64_VERSION
+                        min_version = ZIP64_VERSION
 
-                if zinfo.compress_type == ZIP_BZIP2:
-                    min_version = max(BZIP2_VERSION, min_version)
-                elif zinfo.compress_type == ZIP_LZMA:
-                    min_version = max(LZMA_VERSION, min_version)
+                    if zinfo.compress_type == ZIP_BZIP2:
+                        min_version = max(BZIP2_VERSION, min_version)
+                    elif zinfo.compress_type == ZIP_LZMA:
+                        min_version = max(LZMA_VERSION, min_version)
 
-                extract_version = max(min_version, zinfo.extract_version)
-                create_version = max(min_version, zinfo.create_version)
-                try:
-                    filename, flag_bits = zinfo._encodeFilenameFlags()
-                    centdir = struct.pack(structCentralDir,
-                        stringCentralDir, create_version,
-                        zinfo.create_system, extract_version, zinfo.reserved,
-                        flag_bits, zinfo.compress_type, dostime, dosdate,
-                        zinfo.CRC, compress_size, file_size,
-                        len(filename), len(extra_data), len(zinfo.comment),
-                        0, zinfo.internal_attr, zinfo.external_attr,
-                        header_offset)
-                except DeprecationWarning:
-                    print((structCentralDir, stringCentralDir, create_version,
-                        zinfo.create_system, extract_version, zinfo.reserved,
-                        zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
-                        zinfo.CRC, compress_size, file_size,
-                        len(zinfo.filename), len(extra_data), len(zinfo.comment),
-                        0, zinfo.internal_attr, zinfo.external_attr,
-                        header_offset), file=sys.stderr)
-                    raise
-                self.fp.write(centdir)
-                self.fp.write(filename)
-                self.fp.write(extra_data)
-                self.fp.write(zinfo.comment)
+                    extract_version = max(min_version, zinfo.extract_version)
+                    create_version = max(min_version, zinfo.create_version)
+                    try:
+                        filename, flag_bits = zinfo._encodeFilenameFlags()
+                        centdir = struct.pack(structCentralDir,
+                            stringCentralDir, create_version,
+                            zinfo.create_system, extract_version, zinfo.reserved,
+                            flag_bits, zinfo.compress_type, dostime, dosdate,
+                            zinfo.CRC, compress_size, file_size,
+                            len(filename), len(extra_data), len(zinfo.comment),
+                            0, zinfo.internal_attr, zinfo.external_attr,
+                            header_offset)
+                    except DeprecationWarning:
+                        print((structCentralDir, stringCentralDir, create_version,
+                            zinfo.create_system, extract_version, zinfo.reserved,
+                            zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+                            zinfo.CRC, compress_size, file_size,
+                            len(zinfo.filename), len(extra_data), len(zinfo.comment),
+                            0, zinfo.internal_attr, zinfo.external_attr,
+                            header_offset), file=sys.stderr)
+                        raise
+                    self.fp.write(centdir)
+                    self.fp.write(filename)
+                    self.fp.write(extra_data)
+                    self.fp.write(zinfo.comment)
 
-            pos2 = self.fp.tell()
-            # Write end-of-zip-archive record
-            centDirCount = count
-            centDirSize = pos2 - pos1
-            centDirOffset = pos1
-            if (centDirCount >= ZIP_FILECOUNT_LIMIT or
-                centDirOffset > ZIP64_LIMIT or
-                centDirSize > ZIP64_LIMIT):
-                # Need to write the ZIP64 end-of-archive records
-                zip64endrec = struct.pack(
-                        structEndArchive64, stringEndArchive64,
-                        44, 45, 45, 0, 0, centDirCount, centDirCount,
-                        centDirSize, centDirOffset)
-                self.fp.write(zip64endrec)
+                pos2 = self.fp.tell()
+                # Write end-of-zip-archive record
+                centDirCount = count
+                centDirSize = pos2 - pos1
+                centDirOffset = pos1
+                if (centDirCount >= ZIP_FILECOUNT_LIMIT or
+                    centDirOffset > ZIP64_LIMIT or
+                    centDirSize > ZIP64_LIMIT):
+                    # Need to write the ZIP64 end-of-archive records
+                    zip64endrec = struct.pack(
+                            structEndArchive64, stringEndArchive64,
+                            44, 45, 45, 0, 0, centDirCount, centDirCount,
+                            centDirSize, centDirOffset)
+                    self.fp.write(zip64endrec)
 
-                zip64locrec = struct.pack(
-                        structEndArchive64Locator,
-                        stringEndArchive64Locator, 0, pos2, 1)
-                self.fp.write(zip64locrec)
-                centDirCount = min(centDirCount, 0xFFFF)
-                centDirSize = min(centDirSize, 0xFFFFFFFF)
-                centDirOffset = min(centDirOffset, 0xFFFFFFFF)
+                    zip64locrec = struct.pack(
+                            structEndArchive64Locator,
+                            stringEndArchive64Locator, 0, pos2, 1)
+                    self.fp.write(zip64locrec)
+                    centDirCount = min(centDirCount, 0xFFFF)
+                    centDirSize = min(centDirSize, 0xFFFFFFFF)
+                    centDirOffset = min(centDirOffset, 0xFFFFFFFF)
 
-            endrec = struct.pack(structEndArchive, stringEndArchive,
-                                 0, 0, centDirCount, centDirCount,
-                                 centDirSize, centDirOffset, len(self._comment))
-            self.fp.write(endrec)
-            self.fp.write(self._comment)
-            self.fp.flush()
-
-        if not self._filePassed:
-            self.fp.close()
-        self.fp = None
+                endrec = struct.pack(structEndArchive, stringEndArchive,
+                                    0, 0, centDirCount, centDirCount,
+                                    centDirSize, centDirOffset, len(self._comment))
+                self.fp.write(endrec)
+                self.fp.write(self._comment)
+                self.fp.flush()
+        finally:
+            fp = self.fp
+            self.fp = None
+            if not self._filePassed:
+                fp.close()
 
 
 class PyZipFile(ZipFile):
@@ -1677,16 +1664,15 @@
         if len(args) != 2:
             print(USAGE)
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        zf.printdir()
-        zf.close()
+        with ZipFile(args[1], 'r') as zf:
+            zf.printdir()
 
     elif args[0] == '-t':
         if len(args) != 2:
             print(USAGE)
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        badfile = zf.testzip()
+        with ZipFile(args[1], 'r') as zf:
+            badfile = zf.testzip()
         if badfile:
             print("The following enclosed file is corrupted: {!r}".format(badfile))
         print("Done testing")
@@ -1696,20 +1682,19 @@
             print(USAGE)
             sys.exit(1)
 
-        zf = ZipFile(args[1], 'r')
-        out = args[2]
-        for path in zf.namelist():
-            if path.startswith('./'):
-                tgt = os.path.join(out, path[2:])
-            else:
-                tgt = os.path.join(out, path)
+        with ZipFile(args[1], 'r') as zf:
+            out = args[2]
+            for path in zf.namelist():
+                if path.startswith('./'):
+                    tgt = os.path.join(out, path[2:])
+                else:
+                    tgt = os.path.join(out, path)
 
-            tgtdir = os.path.dirname(tgt)
-            if not os.path.exists(tgtdir):
-                os.makedirs(tgtdir)
-            with open(tgt, 'wb') as fp:
-                fp.write(zf.read(path))
-        zf.close()
+                tgtdir = os.path.dirname(tgt)
+                if not os.path.exists(tgtdir):
+                    os.makedirs(tgtdir)
+                with open(tgt, 'wb') as fp:
+                    fp.write(zf.read(path))
 
     elif args[0] == '-c':
         if len(args) < 3:
@@ -1725,11 +1710,9 @@
                             os.path.join(path, nm), os.path.join(zippath, nm))
             # else: ignore
 
-        zf = ZipFile(args[1], 'w', allowZip64=True)
-        for src in args[2:]:
-            addToZip(zf, src, os.path.basename(src))
-
-        zf.close()
+        with ZipFile(args[1], 'w', allowZip64=True) as zf:
+            for src in args[2:]:
+                addToZip(zf, src, os.path.basename(src))
 
 if __name__ == "__main__":
     main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 Library
 -------
 
+- Issue #16408: Fix file descriptors not being closed in error conditions
+  in the zipfile module.  Patch by Serhiy Storchaka.
+
 - Issue #16481: multiprocessing no longer leaks process handles on Windows.
 
 - Issue #16140: The subprocess module no longer double closes its child

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

From python-checkins at python.org  Sat Nov 17 23:56:14 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 23:56:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316408=3A_Fix_file_descriptors_not_being_closed_?=
 =?utf-8?q?in_error_conditions_in_the?=
Message-ID: <3Y3s9p1DwtzRnS@mail.python.org>

http://hg.python.org/cpython/rev/779e8f31dd30
changeset:   80484:779e8f31dd30
parent:      80481:5f2624db78bd
parent:      80483:27cb1a3d57c8
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 23:54:40 2012 +0100
summary:
  Issue #16408: Fix file descriptors not being closed in error conditions in the zipfile module.
Patch by Serhiy Storchaka.

files:
  Lib/zipfile.py |  425 +++++++++++++++++-------------------
  Misc/NEWS      |    3 +
  2 files changed, 207 insertions(+), 221 deletions(-)


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -906,30 +906,34 @@
             self.fp = file
             self.filename = getattr(file, 'name', None)
 
-        if key == 'r':
-            self._GetContents()
-        elif key == 'w':
-            # set the modified flag so central directory gets written
-            # even if no files are added to the archive
-            self._didModify = True
-        elif key == 'a':
-            try:
-                # See if file is a zip file
+        try:
+            if key == 'r':
                 self._RealGetContents()
-                # seek to start of directory and overwrite
-                self.fp.seek(self.start_dir, 0)
-            except BadZipFile:
-                # file is not a zip file, just append
-                self.fp.seek(0, 2)
-
+            elif key == 'w':
                 # set the modified flag so central directory gets written
                 # even if no files are added to the archive
                 self._didModify = True
-        else:
+            elif key == 'a':
+                try:
+                    # See if file is a zip file
+                    self._RealGetContents()
+                    # seek to start of directory and overwrite
+                    self.fp.seek(self.start_dir, 0)
+                except BadZipFile:
+                    # file is not a zip file, just append
+                    self.fp.seek(0, 2)
+
+                    # set the modified flag so central directory gets written
+                    # even if no files are added to the archive
+                    self._didModify = True
+            else:
+                raise RuntimeError('Mode must be "r", "w" or "a"')
+        except:
+            fp = self.fp
+            self.fp = None
             if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise RuntimeError('Mode must be "r", "w" or "a"')
+                fp.close()
+            raise
 
     def __enter__(self):
         return self
@@ -937,17 +941,6 @@
     def __exit__(self, type, value, traceback):
         self.close()
 
-    def _GetContents(self):
-        """Read the directory, making sure we close the file if the format
-        is bad."""
-        try:
-            self._RealGetContents()
-        except BadZipFile:
-            if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise
-
     def _RealGetContents(self):
         """Read in the table of contents for the ZIP file."""
         fp = self.fp
@@ -1049,9 +1042,9 @@
             try:
                 # Read by chunks, to avoid an OverflowError or a
                 # MemoryError with very large embedded files.
-                f = self.open(zinfo.filename, "r")
-                while f.read(chunk_size):     # Check CRC-32
-                    pass
+                with self.open(zinfo.filename, "r") as f:
+                    while f.read(chunk_size):     # Check CRC-32
+                        pass
             except BadZipFile:
                 return zinfo.filename
 
@@ -1113,84 +1106,78 @@
         else:
             zef_file = io.open(self.filename, 'rb')
 
-        # Make sure we have an info object
-        if isinstance(name, ZipInfo):
-            # 'name' is already an info object
-            zinfo = name
-        else:
-            # Get info object for name
-            try:
+        try:
+            # Make sure we have an info object
+            if isinstance(name, ZipInfo):
+                # 'name' is already an info object
+                zinfo = name
+            else:
+                # Get info object for name
                 zinfo = self.getinfo(name)
-            except KeyError:
-                if not self._filePassed:
-                    zef_file.close()
-                raise
-        zef_file.seek(zinfo.header_offset, 0)
+            zef_file.seek(zinfo.header_offset, 0)
 
-        # Skip the file header:
-        fheader = zef_file.read(sizeFileHeader)
-        if fheader[0:4] != stringFileHeader:
-            raise BadZipFile("Bad magic number for file header")
+            # Skip the file header:
+            fheader = zef_file.read(sizeFileHeader)
+            if fheader[0:4] != stringFileHeader:
+                raise BadZipFile("Bad magic number for file header")
 
-        fheader = struct.unpack(structFileHeader, fheader)
-        fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
-        if fheader[_FH_EXTRA_FIELD_LENGTH]:
-            zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
+            fheader = struct.unpack(structFileHeader, fheader)
+            fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
+            if fheader[_FH_EXTRA_FIELD_LENGTH]:
+                zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
 
-        if zinfo.flag_bits & 0x20:
-            # Zip 2.7: compressed patched data
-            raise NotImplementedError("compressed patched data (flag bit 5)")
+            if zinfo.flag_bits & 0x20:
+                # Zip 2.7: compressed patched data
+                raise NotImplementedError("compressed patched data (flag bit 5)")
 
-        if zinfo.flag_bits & 0x40:
-            # strong encryption
-            raise NotImplementedError("strong encryption (flag bit 6)")
+            if zinfo.flag_bits & 0x40:
+                # strong encryption
+                raise NotImplementedError("strong encryption (flag bit 6)")
 
-        if zinfo.flag_bits & 0x800:
-            # UTF-8 filename
-            fname_str = fname.decode("utf-8")
-        else:
-            fname_str = fname.decode("cp437")
+            if zinfo.flag_bits & 0x800:
+                # UTF-8 filename
+                fname_str = fname.decode("utf-8")
+            else:
+                fname_str = fname.decode("cp437")
 
-        if fname_str != zinfo.orig_filename:
+            if fname_str != zinfo.orig_filename:
+                raise BadZipFile(
+                    'File name in directory %r and header %r differ.'
+                    % (zinfo.orig_filename, fname))
+
+            # check for encrypted flag & handle password
+            is_encrypted = zinfo.flag_bits & 0x1
+            zd = None
+            if is_encrypted:
+                if not pwd:
+                    pwd = self.pwd
+                if not pwd:
+                    raise RuntimeError("File %s is encrypted, password "
+                                       "required for extraction" % name)
+
+                zd = _ZipDecrypter(pwd)
+                # The first 12 bytes in the cypher stream is an encryption header
+                #  used to strengthen the algorithm. The first 11 bytes are
+                #  completely random, while the 12th contains the MSB of the CRC,
+                #  or the MSB of the file time depending on the header type
+                #  and is used to check the correctness of the password.
+                header = zef_file.read(12)
+                h = list(map(zd, header[0:12]))
+                if zinfo.flag_bits & 0x8:
+                    # compare against the file type from extended local headers
+                    check_byte = (zinfo._raw_time >> 8) & 0xff
+                else:
+                    # compare against the CRC otherwise
+                    check_byte = (zinfo.CRC >> 24) & 0xff
+                if h[11] != check_byte:
+                    raise RuntimeError("Bad password for file", name)
+
+            return ZipExtFile(zef_file, mode, zinfo, zd,
+                              close_fileobj=not self._filePassed)
+        except:
             if not self._filePassed:
                 zef_file.close()
-            raise BadZipFile(
-                  'File name in directory %r and header %r differ.'
-                  % (zinfo.orig_filename, fname))
-
-        # check for encrypted flag & handle password
-        is_encrypted = zinfo.flag_bits & 0x1
-        zd = None
-        if is_encrypted:
-            if not pwd:
-                pwd = self.pwd
-            if not pwd:
-                if not self._filePassed:
-                    zef_file.close()
-                raise RuntimeError("File %s is encrypted, "
-                                   "password required for extraction" % name)
-
-            zd = _ZipDecrypter(pwd)
-            # The first 12 bytes in the cypher stream is an encryption header
-            #  used to strengthen the algorithm. The first 11 bytes are
-            #  completely random, while the 12th contains the MSB of the CRC,
-            #  or the MSB of the file time depending on the header type
-            #  and is used to check the correctness of the password.
-            header = zef_file.read(12)
-            h = list(map(zd, header[0:12]))
-            if zinfo.flag_bits & 0x8:
-                # compare against the file type from extended local headers
-                check_byte = (zinfo._raw_time >> 8) & 0xff
-            else:
-                # compare against the CRC otherwise
-                check_byte = (zinfo.CRC >> 24) & 0xff
-            if h[11] != check_byte:
-                if not self._filePassed:
-                    zef_file.close()
-                raise RuntimeError("Bad password for file", name)
-
-        return ZipExtFile(zef_file, mode, zinfo, zd,
-                          close_fileobj=not self._filePassed)
+            raise
 
     def extract(self, member, path=None, pwd=None):
         """Extract a member from the archive to the current working directory,
@@ -1247,11 +1234,9 @@
                 os.mkdir(targetpath)
             return targetpath
 
-        source = self.open(member, pwd=pwd)
-        target = open(targetpath, "wb")
-        shutil.copyfileobj(source, target)
-        source.close()
-        target.close()
+        with self.open(member, pwd=pwd) as source, \
+             open(targetpath, "wb") as target:
+            shutil.copyfileobj(source, target)
 
         return targetpath
 
@@ -1411,105 +1396,107 @@
         if self.fp is None:
             return
 
-        if self.mode in ("w", "a") and self._didModify: # write ending records
-            count = 0
-            pos1 = self.fp.tell()
-            for zinfo in self.filelist:         # write central directory
-                count = count + 1
-                dt = zinfo.date_time
-                dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
-                dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
-                extra = []
-                if zinfo.file_size > ZIP64_LIMIT \
-                        or zinfo.compress_size > ZIP64_LIMIT:
-                    extra.append(zinfo.file_size)
-                    extra.append(zinfo.compress_size)
-                    file_size = 0xffffffff
-                    compress_size = 0xffffffff
-                else:
-                    file_size = zinfo.file_size
-                    compress_size = zinfo.compress_size
+        try:
+            if self.mode in ("w", "a") and self._didModify: # write ending records
+                count = 0
+                pos1 = self.fp.tell()
+                for zinfo in self.filelist:         # write central directory
+                    count = count + 1
+                    dt = zinfo.date_time
+                    dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
+                    dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
+                    extra = []
+                    if zinfo.file_size > ZIP64_LIMIT \
+                            or zinfo.compress_size > ZIP64_LIMIT:
+                        extra.append(zinfo.file_size)
+                        extra.append(zinfo.compress_size)
+                        file_size = 0xffffffff
+                        compress_size = 0xffffffff
+                    else:
+                        file_size = zinfo.file_size
+                        compress_size = zinfo.compress_size
 
-                if zinfo.header_offset > ZIP64_LIMIT:
-                    extra.append(zinfo.header_offset)
-                    header_offset = 0xffffffff
-                else:
-                    header_offset = zinfo.header_offset
+                    if zinfo.header_offset > ZIP64_LIMIT:
+                        extra.append(zinfo.header_offset)
+                        header_offset = 0xffffffff
+                    else:
+                        header_offset = zinfo.header_offset
 
-                extra_data = zinfo.extra
-                min_version = 0
-                if extra:
-                    # Append a ZIP64 field to the extra's
-                    extra_data = struct.pack(
-                            '<HH' + 'Q'*len(extra),
-                            1, 8*len(extra), *extra) + extra_data
+                    extra_data = zinfo.extra
+                    min_version = 0
+                    if extra:
+                        # Append a ZIP64 field to the extra's
+                        extra_data = struct.pack(
+                                '<HH' + 'Q'*len(extra),
+                                1, 8*len(extra), *extra) + extra_data
 
-                    min_version = ZIP64_VERSION
+                        min_version = ZIP64_VERSION
 
-                if zinfo.compress_type == ZIP_BZIP2:
-                    min_version = max(BZIP2_VERSION, min_version)
-                elif zinfo.compress_type == ZIP_LZMA:
-                    min_version = max(LZMA_VERSION, min_version)
+                    if zinfo.compress_type == ZIP_BZIP2:
+                        min_version = max(BZIP2_VERSION, min_version)
+                    elif zinfo.compress_type == ZIP_LZMA:
+                        min_version = max(LZMA_VERSION, min_version)
 
-                extract_version = max(min_version, zinfo.extract_version)
-                create_version = max(min_version, zinfo.create_version)
-                try:
-                    filename, flag_bits = zinfo._encodeFilenameFlags()
-                    centdir = struct.pack(structCentralDir,
-                        stringCentralDir, create_version,
-                        zinfo.create_system, extract_version, zinfo.reserved,
-                        flag_bits, zinfo.compress_type, dostime, dosdate,
-                        zinfo.CRC, compress_size, file_size,
-                        len(filename), len(extra_data), len(zinfo.comment),
-                        0, zinfo.internal_attr, zinfo.external_attr,
-                        header_offset)
-                except DeprecationWarning:
-                    print((structCentralDir, stringCentralDir, create_version,
-                        zinfo.create_system, extract_version, zinfo.reserved,
-                        zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
-                        zinfo.CRC, compress_size, file_size,
-                        len(zinfo.filename), len(extra_data), len(zinfo.comment),
-                        0, zinfo.internal_attr, zinfo.external_attr,
-                        header_offset), file=sys.stderr)
-                    raise
-                self.fp.write(centdir)
-                self.fp.write(filename)
-                self.fp.write(extra_data)
-                self.fp.write(zinfo.comment)
+                    extract_version = max(min_version, zinfo.extract_version)
+                    create_version = max(min_version, zinfo.create_version)
+                    try:
+                        filename, flag_bits = zinfo._encodeFilenameFlags()
+                        centdir = struct.pack(structCentralDir,
+                            stringCentralDir, create_version,
+                            zinfo.create_system, extract_version, zinfo.reserved,
+                            flag_bits, zinfo.compress_type, dostime, dosdate,
+                            zinfo.CRC, compress_size, file_size,
+                            len(filename), len(extra_data), len(zinfo.comment),
+                            0, zinfo.internal_attr, zinfo.external_attr,
+                            header_offset)
+                    except DeprecationWarning:
+                        print((structCentralDir, stringCentralDir, create_version,
+                            zinfo.create_system, extract_version, zinfo.reserved,
+                            zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+                            zinfo.CRC, compress_size, file_size,
+                            len(zinfo.filename), len(extra_data), len(zinfo.comment),
+                            0, zinfo.internal_attr, zinfo.external_attr,
+                            header_offset), file=sys.stderr)
+                        raise
+                    self.fp.write(centdir)
+                    self.fp.write(filename)
+                    self.fp.write(extra_data)
+                    self.fp.write(zinfo.comment)
 
-            pos2 = self.fp.tell()
-            # Write end-of-zip-archive record
-            centDirCount = count
-            centDirSize = pos2 - pos1
-            centDirOffset = pos1
-            if (centDirCount >= ZIP_FILECOUNT_LIMIT or
-                centDirOffset > ZIP64_LIMIT or
-                centDirSize > ZIP64_LIMIT):
-                # Need to write the ZIP64 end-of-archive records
-                zip64endrec = struct.pack(
-                        structEndArchive64, stringEndArchive64,
-                        44, 45, 45, 0, 0, centDirCount, centDirCount,
-                        centDirSize, centDirOffset)
-                self.fp.write(zip64endrec)
+                pos2 = self.fp.tell()
+                # Write end-of-zip-archive record
+                centDirCount = count
+                centDirSize = pos2 - pos1
+                centDirOffset = pos1
+                if (centDirCount >= ZIP_FILECOUNT_LIMIT or
+                    centDirOffset > ZIP64_LIMIT or
+                    centDirSize > ZIP64_LIMIT):
+                    # Need to write the ZIP64 end-of-archive records
+                    zip64endrec = struct.pack(
+                            structEndArchive64, stringEndArchive64,
+                            44, 45, 45, 0, 0, centDirCount, centDirCount,
+                            centDirSize, centDirOffset)
+                    self.fp.write(zip64endrec)
 
-                zip64locrec = struct.pack(
-                        structEndArchive64Locator,
-                        stringEndArchive64Locator, 0, pos2, 1)
-                self.fp.write(zip64locrec)
-                centDirCount = min(centDirCount, 0xFFFF)
-                centDirSize = min(centDirSize, 0xFFFFFFFF)
-                centDirOffset = min(centDirOffset, 0xFFFFFFFF)
+                    zip64locrec = struct.pack(
+                            structEndArchive64Locator,
+                            stringEndArchive64Locator, 0, pos2, 1)
+                    self.fp.write(zip64locrec)
+                    centDirCount = min(centDirCount, 0xFFFF)
+                    centDirSize = min(centDirSize, 0xFFFFFFFF)
+                    centDirOffset = min(centDirOffset, 0xFFFFFFFF)
 
-            endrec = struct.pack(structEndArchive, stringEndArchive,
-                                 0, 0, centDirCount, centDirCount,
-                                 centDirSize, centDirOffset, len(self._comment))
-            self.fp.write(endrec)
-            self.fp.write(self._comment)
-            self.fp.flush()
-
-        if not self._filePassed:
-            self.fp.close()
-        self.fp = None
+                endrec = struct.pack(structEndArchive, stringEndArchive,
+                                    0, 0, centDirCount, centDirCount,
+                                    centDirSize, centDirOffset, len(self._comment))
+                self.fp.write(endrec)
+                self.fp.write(self._comment)
+                self.fp.flush()
+        finally:
+            fp = self.fp
+            self.fp = None
+            if not self._filePassed:
+                fp.close()
 
 
 class PyZipFile(ZipFile):
@@ -1676,16 +1663,15 @@
         if len(args) != 2:
             print(USAGE)
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        zf.printdir()
-        zf.close()
+        with ZipFile(args[1], 'r') as zf:
+            zf.printdir()
 
     elif args[0] == '-t':
         if len(args) != 2:
             print(USAGE)
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        badfile = zf.testzip()
+        with ZipFile(args[1], 'r') as zf:
+            badfile = zf.testzip()
         if badfile:
             print("The following enclosed file is corrupted: {!r}".format(badfile))
         print("Done testing")
@@ -1695,20 +1681,19 @@
             print(USAGE)
             sys.exit(1)
 
-        zf = ZipFile(args[1], 'r')
-        out = args[2]
-        for path in zf.namelist():
-            if path.startswith('./'):
-                tgt = os.path.join(out, path[2:])
-            else:
-                tgt = os.path.join(out, path)
+        with ZipFile(args[1], 'r') as zf:
+            out = args[2]
+            for path in zf.namelist():
+                if path.startswith('./'):
+                    tgt = os.path.join(out, path[2:])
+                else:
+                    tgt = os.path.join(out, path)
 
-            tgtdir = os.path.dirname(tgt)
-            if not os.path.exists(tgtdir):
-                os.makedirs(tgtdir)
-            with open(tgt, 'wb') as fp:
-                fp.write(zf.read(path))
-        zf.close()
+                tgtdir = os.path.dirname(tgt)
+                if not os.path.exists(tgtdir):
+                    os.makedirs(tgtdir)
+                with open(tgt, 'wb') as fp:
+                    fp.write(zf.read(path))
 
     elif args[0] == '-c':
         if len(args) < 3:
@@ -1724,11 +1709,9 @@
                             os.path.join(path, nm), os.path.join(zippath, nm))
             # else: ignore
 
-        zf = ZipFile(args[1], 'w', allowZip64=True)
-        for src in args[2:]:
-            addToZip(zf, src, os.path.basename(src))
-
-        zf.close()
+        with ZipFile(args[1], 'w', allowZip64=True) as zf:
+            for src in args[2:]:
+                addToZip(zf, src, os.path.basename(src))
 
 if __name__ == "__main__":
     main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@
 Library
 -------
 
+- Issue #16408: Fix file descriptors not being closed in error conditions
+  in the zipfile module.  Patch by Serhiy Storchaka.
+
 - Issue #14631: Add a new :class:`weakref.WeakMethod` to simulate weak
   references to bound methods.
 

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

From python-checkins at python.org  Sat Nov 17 23:58:44 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 17 Nov 2012 23:58:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2NDA4?=
 =?utf-8?q?=3A_Fix_file_descriptors_not_being_closed_in_error_conditions_i?=
 =?utf-8?q?n_the?=
Message-ID: <3Y3sDh2pg2zRnQ@mail.python.org>

http://hg.python.org/cpython/rev/eba28506eed3
changeset:   80485:eba28506eed3
branch:      2.7
parent:      80479:ff300ccd119d
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 17 23:56:53 2012 +0100
summary:
  Issue #16408: Fix file descriptors not being closed in error conditions in the zipfile module.
Patch by Serhiy Storchaka.

files:
  Lib/zipfile.py |  388 ++++++++++++++++++------------------
  Misc/NEWS      |    3 +
  2 files changed, 194 insertions(+), 197 deletions(-)


diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -718,30 +718,34 @@
             self.fp = file
             self.filename = getattr(file, 'name', None)
 
-        if key == 'r':
-            self._GetContents()
-        elif key == 'w':
-            # set the modified flag so central directory gets written
-            # even if no files are added to the archive
-            self._didModify = True
-        elif key == 'a':
-            try:
-                # See if file is a zip file
+        try:
+            if key == 'r':
                 self._RealGetContents()
-                # seek to start of directory and overwrite
-                self.fp.seek(self.start_dir, 0)
-            except BadZipfile:
-                # file is not a zip file, just append
-                self.fp.seek(0, 2)
-
+            elif key == 'w':
                 # set the modified flag so central directory gets written
                 # even if no files are added to the archive
                 self._didModify = True
-        else:
+            elif key == 'a':
+                try:
+                    # See if file is a zip file
+                    self._RealGetContents()
+                    # seek to start of directory and overwrite
+                    self.fp.seek(self.start_dir, 0)
+                except BadZipfile:
+                    # file is not a zip file, just append
+                    self.fp.seek(0, 2)
+
+                    # set the modified flag so central directory gets written
+                    # even if no files are added to the archive
+                    self._didModify = True
+            else:
+                raise RuntimeError('Mode must be "r", "w" or "a"')
+        except:
+            fp = self.fp
+            self.fp = None
             if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise RuntimeError, 'Mode must be "r", "w" or "a"'
+                fp.close()
+            raise
 
     def __enter__(self):
         return self
@@ -749,17 +753,6 @@
     def __exit__(self, type, value, traceback):
         self.close()
 
-    def _GetContents(self):
-        """Read the directory, making sure we close the file if the format
-        is bad."""
-        try:
-            self._RealGetContents()
-        except BadZipfile:
-            if not self._filePassed:
-                self.fp.close()
-                self.fp = None
-            raise
-
     def _RealGetContents(self):
         """Read in the table of contents for the ZIP file."""
         fp = self.fp
@@ -853,9 +846,9 @@
             try:
                 # Read by chunks, to avoid an OverflowError or a
                 # MemoryError with very large embedded files.
-                f = self.open(zinfo.filename, "r")
-                while f.read(chunk_size):     # Check CRC-32
-                    pass
+                with self.open(zinfo.filename, "r") as f:
+                    while f.read(chunk_size):     # Check CRC-32
+                        pass
             except BadZipfile:
                 return zinfo.filename
 
@@ -909,60 +902,65 @@
             zef_file = open(self.filename, 'rb')
             should_close = True
 
-        # Make sure we have an info object
-        if isinstance(name, ZipInfo):
-            # 'name' is already an info object
-            zinfo = name
-        else:
-            # Get info object for name
-            zinfo = self.getinfo(name)
+        try:
+            # Make sure we have an info object
+            if isinstance(name, ZipInfo):
+                # 'name' is already an info object
+                zinfo = name
+            else:
+                # Get info object for name
+                zinfo = self.getinfo(name)
 
-        zef_file.seek(zinfo.header_offset, 0)
+            zef_file.seek(zinfo.header_offset, 0)
 
-        # Skip the file header:
-        fheader = zef_file.read(sizeFileHeader)
-        if fheader[0:4] != stringFileHeader:
-            raise BadZipfile, "Bad magic number for file header"
+            # Skip the file header:
+            fheader = zef_file.read(sizeFileHeader)
+            if fheader[0:4] != stringFileHeader:
+                raise BadZipfile, "Bad magic number for file header"
 
-        fheader = struct.unpack(structFileHeader, fheader)
-        fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
-        if fheader[_FH_EXTRA_FIELD_LENGTH]:
-            zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
+            fheader = struct.unpack(structFileHeader, fheader)
+            fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
+            if fheader[_FH_EXTRA_FIELD_LENGTH]:
+                zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
 
-        if fname != zinfo.orig_filename:
-            raise BadZipfile, \
-                      'File name in directory "%s" and header "%s" differ.' % (
-                          zinfo.orig_filename, fname)
+            if fname != zinfo.orig_filename:
+                raise BadZipfile, \
+                        'File name in directory "%s" and header "%s" differ.' % (
+                            zinfo.orig_filename, fname)
 
-        # check for encrypted flag & handle password
-        is_encrypted = zinfo.flag_bits & 0x1
-        zd = None
-        if is_encrypted:
-            if not pwd:
-                pwd = self.pwd
-            if not pwd:
-                raise RuntimeError, "File %s is encrypted, " \
-                      "password required for extraction" % name
+            # check for encrypted flag & handle password
+            is_encrypted = zinfo.flag_bits & 0x1
+            zd = None
+            if is_encrypted:
+                if not pwd:
+                    pwd = self.pwd
+                if not pwd:
+                    raise RuntimeError, "File %s is encrypted, " \
+                        "password required for extraction" % name
 
-            zd = _ZipDecrypter(pwd)
-            # The first 12 bytes in the cypher stream is an encryption header
-            #  used to strengthen the algorithm. The first 11 bytes are
-            #  completely random, while the 12th contains the MSB of the CRC,
-            #  or the MSB of the file time depending on the header type
-            #  and is used to check the correctness of the password.
-            bytes = zef_file.read(12)
-            h = map(zd, bytes[0:12])
-            if zinfo.flag_bits & 0x8:
-                # compare against the file type from extended local headers
-                check_byte = (zinfo._raw_time >> 8) & 0xff
-            else:
-                # compare against the CRC otherwise
-                check_byte = (zinfo.CRC >> 24) & 0xff
-            if ord(h[11]) != check_byte:
-                raise RuntimeError("Bad password for file", name)
+                zd = _ZipDecrypter(pwd)
+                # The first 12 bytes in the cypher stream is an encryption header
+                #  used to strengthen the algorithm. The first 11 bytes are
+                #  completely random, while the 12th contains the MSB of the CRC,
+                #  or the MSB of the file time depending on the header type
+                #  and is used to check the correctness of the password.
+                bytes = zef_file.read(12)
+                h = map(zd, bytes[0:12])
+                if zinfo.flag_bits & 0x8:
+                    # compare against the file type from extended local headers
+                    check_byte = (zinfo._raw_time >> 8) & 0xff
+                else:
+                    # compare against the CRC otherwise
+                    check_byte = (zinfo.CRC >> 24) & 0xff
+                if ord(h[11]) != check_byte:
+                    raise RuntimeError("Bad password for file", name)
 
-        return  ZipExtFile(zef_file, mode, zinfo, zd,
-                close_fileobj=should_close)
+            return ZipExtFile(zef_file, mode, zinfo, zd,
+                    close_fileobj=should_close)
+        except:
+            if should_close:
+                zef_file.close()
+            raise
 
     def extract(self, member, path=None, pwd=None):
         """Extract a member from the archive to the current working directory,
@@ -1019,11 +1017,9 @@
                 os.mkdir(targetpath)
             return targetpath
 
-        source = self.open(member, pwd=pwd)
-        target = file(targetpath, "wb")
-        shutil.copyfileobj(source, target)
-        source.close()
-        target.close()
+        with self.open(member, pwd=pwd) as source, \
+             file(targetpath, "wb") as target:
+            shutil.copyfileobj(source, target)
 
         return targetpath
 
@@ -1184,102 +1180,104 @@
         if self.fp is None:
             return
 
-        if self.mode in ("w", "a") and self._didModify: # write ending records
-            count = 0
-            pos1 = self.fp.tell()
-            for zinfo in self.filelist:         # write central directory
-                count = count + 1
-                dt = zinfo.date_time
-                dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
-                dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
-                extra = []
-                if zinfo.file_size > ZIP64_LIMIT \
-                        or zinfo.compress_size > ZIP64_LIMIT:
-                    extra.append(zinfo.file_size)
-                    extra.append(zinfo.compress_size)
-                    file_size = 0xffffffff
-                    compress_size = 0xffffffff
-                else:
-                    file_size = zinfo.file_size
-                    compress_size = zinfo.compress_size
+        try:
+            if self.mode in ("w", "a") and self._didModify: # write ending records
+                count = 0
+                pos1 = self.fp.tell()
+                for zinfo in self.filelist:         # write central directory
+                    count = count + 1
+                    dt = zinfo.date_time
+                    dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
+                    dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
+                    extra = []
+                    if zinfo.file_size > ZIP64_LIMIT \
+                            or zinfo.compress_size > ZIP64_LIMIT:
+                        extra.append(zinfo.file_size)
+                        extra.append(zinfo.compress_size)
+                        file_size = 0xffffffff
+                        compress_size = 0xffffffff
+                    else:
+                        file_size = zinfo.file_size
+                        compress_size = zinfo.compress_size
 
-                if zinfo.header_offset > ZIP64_LIMIT:
-                    extra.append(zinfo.header_offset)
-                    header_offset = 0xffffffffL
-                else:
-                    header_offset = zinfo.header_offset
+                    if zinfo.header_offset > ZIP64_LIMIT:
+                        extra.append(zinfo.header_offset)
+                        header_offset = 0xffffffffL
+                    else:
+                        header_offset = zinfo.header_offset
 
-                extra_data = zinfo.extra
-                if extra:
-                    # Append a ZIP64 field to the extra's
-                    extra_data = struct.pack(
-                            '<HH' + 'Q'*len(extra),
-                            1, 8*len(extra), *extra) + extra_data
+                    extra_data = zinfo.extra
+                    if extra:
+                        # Append a ZIP64 field to the extra's
+                        extra_data = struct.pack(
+                                '<HH' + 'Q'*len(extra),
+                                1, 8*len(extra), *extra) + extra_data
 
-                    extract_version = max(45, zinfo.extract_version)
-                    create_version = max(45, zinfo.create_version)
-                else:
-                    extract_version = zinfo.extract_version
-                    create_version = zinfo.create_version
+                        extract_version = max(45, zinfo.extract_version)
+                        create_version = max(45, zinfo.create_version)
+                    else:
+                        extract_version = zinfo.extract_version
+                        create_version = zinfo.create_version
 
-                try:
-                    filename, flag_bits = zinfo._encodeFilenameFlags()
-                    centdir = struct.pack(structCentralDir,
-                     stringCentralDir, create_version,
-                     zinfo.create_system, extract_version, zinfo.reserved,
-                     flag_bits, zinfo.compress_type, dostime, dosdate,
-                     zinfo.CRC, compress_size, file_size,
-                     len(filename), len(extra_data), len(zinfo.comment),
-                     0, zinfo.internal_attr, zinfo.external_attr,
-                     header_offset)
-                except DeprecationWarning:
-                    print >>sys.stderr, (structCentralDir,
-                     stringCentralDir, create_version,
-                     zinfo.create_system, extract_version, zinfo.reserved,
-                     zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
-                     zinfo.CRC, compress_size, file_size,
-                     len(zinfo.filename), len(extra_data), len(zinfo.comment),
-                     0, zinfo.internal_attr, zinfo.external_attr,
-                     header_offset)
-                    raise
-                self.fp.write(centdir)
-                self.fp.write(filename)
-                self.fp.write(extra_data)
-                self.fp.write(zinfo.comment)
+                    try:
+                        filename, flag_bits = zinfo._encodeFilenameFlags()
+                        centdir = struct.pack(structCentralDir,
+                        stringCentralDir, create_version,
+                        zinfo.create_system, extract_version, zinfo.reserved,
+                        flag_bits, zinfo.compress_type, dostime, dosdate,
+                        zinfo.CRC, compress_size, file_size,
+                        len(filename), len(extra_data), len(zinfo.comment),
+                        0, zinfo.internal_attr, zinfo.external_attr,
+                        header_offset)
+                    except DeprecationWarning:
+                        print >>sys.stderr, (structCentralDir,
+                        stringCentralDir, create_version,
+                        zinfo.create_system, extract_version, zinfo.reserved,
+                        zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
+                        zinfo.CRC, compress_size, file_size,
+                        len(zinfo.filename), len(extra_data), len(zinfo.comment),
+                        0, zinfo.internal_attr, zinfo.external_attr,
+                        header_offset)
+                        raise
+                    self.fp.write(centdir)
+                    self.fp.write(filename)
+                    self.fp.write(extra_data)
+                    self.fp.write(zinfo.comment)
 
-            pos2 = self.fp.tell()
-            # Write end-of-zip-archive record
-            centDirCount = count
-            centDirSize = pos2 - pos1
-            centDirOffset = pos1
-            if (centDirCount >= ZIP_FILECOUNT_LIMIT or
-                centDirOffset > ZIP64_LIMIT or
-                centDirSize > ZIP64_LIMIT):
-                # Need to write the ZIP64 end-of-archive records
-                zip64endrec = struct.pack(
-                        structEndArchive64, stringEndArchive64,
-                        44, 45, 45, 0, 0, centDirCount, centDirCount,
-                        centDirSize, centDirOffset)
-                self.fp.write(zip64endrec)
+                pos2 = self.fp.tell()
+                # Write end-of-zip-archive record
+                centDirCount = count
+                centDirSize = pos2 - pos1
+                centDirOffset = pos1
+                if (centDirCount >= ZIP_FILECOUNT_LIMIT or
+                    centDirOffset > ZIP64_LIMIT or
+                    centDirSize > ZIP64_LIMIT):
+                    # Need to write the ZIP64 end-of-archive records
+                    zip64endrec = struct.pack(
+                            structEndArchive64, stringEndArchive64,
+                            44, 45, 45, 0, 0, centDirCount, centDirCount,
+                            centDirSize, centDirOffset)
+                    self.fp.write(zip64endrec)
 
-                zip64locrec = struct.pack(
-                        structEndArchive64Locator,
-                        stringEndArchive64Locator, 0, pos2, 1)
-                self.fp.write(zip64locrec)
-                centDirCount = min(centDirCount, 0xFFFF)
-                centDirSize = min(centDirSize, 0xFFFFFFFF)
-                centDirOffset = min(centDirOffset, 0xFFFFFFFF)
+                    zip64locrec = struct.pack(
+                            structEndArchive64Locator,
+                            stringEndArchive64Locator, 0, pos2, 1)
+                    self.fp.write(zip64locrec)
+                    centDirCount = min(centDirCount, 0xFFFF)
+                    centDirSize = min(centDirSize, 0xFFFFFFFF)
+                    centDirOffset = min(centDirOffset, 0xFFFFFFFF)
 
-            endrec = struct.pack(structEndArchive, stringEndArchive,
-                                 0, 0, centDirCount, centDirCount,
-                                 centDirSize, centDirOffset, len(self._comment))
-            self.fp.write(endrec)
-            self.fp.write(self._comment)
-            self.fp.flush()
-
-        if not self._filePassed:
-            self.fp.close()
-        self.fp = None
+                endrec = struct.pack(structEndArchive, stringEndArchive,
+                                    0, 0, centDirCount, centDirCount,
+                                    centDirSize, centDirOffset, len(self._comment))
+                self.fp.write(endrec)
+                self.fp.write(self._comment)
+                self.fp.flush()
+        finally:
+            fp = self.fp
+            self.fp = None
+            if not self._filePassed:
+                fp.close()
 
 
 class PyZipFile(ZipFile):
@@ -1401,16 +1399,15 @@
         if len(args) != 2:
             print USAGE
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        zf.printdir()
-        zf.close()
+        with ZipFile(args[1], 'r') as zf:
+            zf.printdir()
 
     elif args[0] == '-t':
         if len(args) != 2:
             print USAGE
             sys.exit(1)
-        zf = ZipFile(args[1], 'r')
-        badfile = zf.testzip()
+        with ZipFile(args[1], 'r') as zf:
+            badfile = zf.testzip()
         if badfile:
             print("The following enclosed file is corrupted: {!r}".format(badfile))
         print "Done testing"
@@ -1420,20 +1417,19 @@
             print USAGE
             sys.exit(1)
 
-        zf = ZipFile(args[1], 'r')
-        out = args[2]
-        for path in zf.namelist():
-            if path.startswith('./'):
-                tgt = os.path.join(out, path[2:])
-            else:
-                tgt = os.path.join(out, path)
+        with ZipFile(args[1], 'r') as zf:
+            out = args[2]
+            for path in zf.namelist():
+                if path.startswith('./'):
+                    tgt = os.path.join(out, path[2:])
+                else:
+                    tgt = os.path.join(out, path)
 
-            tgtdir = os.path.dirname(tgt)
-            if not os.path.exists(tgtdir):
-                os.makedirs(tgtdir)
-            with open(tgt, 'wb') as fp:
-                fp.write(zf.read(path))
-        zf.close()
+                tgtdir = os.path.dirname(tgt)
+                if not os.path.exists(tgtdir):
+                    os.makedirs(tgtdir)
+                with open(tgt, 'wb') as fp:
+                    fp.write(zf.read(path))
 
     elif args[0] == '-c':
         if len(args) < 3:
@@ -1449,11 +1445,9 @@
                             os.path.join(path, nm), os.path.join(zippath, nm))
             # else: ignore
 
-        zf = ZipFile(args[1], 'w', allowZip64=True)
-        for src in args[2:]:
-            addToZip(zf, src, os.path.basename(src))
-
-        zf.close()
+        with ZipFile(args[1], 'w', allowZip64=True) as zf:
+            for src in args[2:]:
+                addToZip(zf, src, os.path.basename(src))
 
 if __name__ == "__main__":
     main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -148,6 +148,9 @@
 Library
 -------
 
+- Issue #16408: Fix file descriptors not being closed in error conditions
+  in the zipfile module.  Patch by Serhiy Storchaka.
+
 - Issue #16327: The subprocess module no longer leaks file descriptors
   used for stdin/stdout/stderr pipes to the child when fork() fails.
 

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

From python-checkins at python.org  Sun Nov 18 02:47:12 2012
From: python-checkins at python.org (brett.cannon)
Date: Sun, 18 Nov 2012 02:47:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2310966=3A_Remove_t?=
 =?utf-8?q?he_concept_of_unexpected_skipped_tests=2E?=
Message-ID: <3Y3wz45X1WzRqp@mail.python.org>

http://hg.python.org/cpython/rev/eb3714863872
changeset:   80486:eb3714863872
parent:      80484:779e8f31dd30
user:        Brett Cannon <brett at python.org>
date:        Sat Nov 17 20:46:26 2012 -0500
summary:
  Issue #10966: Remove the concept of unexpected skipped tests.

The concept of what was unexpected was typically defined as "some
depencendy wasn't installed", which isn't unexpected at all as it's
totally optional. Since it confuses new contributors as they think
something is wrong with their installation it seems sensible to get
rid of the concept.

This change also adds the concept of optional tests that are required
to work on a specific platform(s) (e.g. test_winreg on Windows). This
should help catch compile issues instead of a test being blindly
skipped even when it should have run.

The skipped test list in the future can also print out the reason for
being skipped to make it more obvious as to why the skipping occurred.

files:
  Lib/test/regrtest.py    |  293 ----------------------------
  Lib/test/support.py     |   15 +-
  Lib/test/test_winreg.py |    2 +-
  Misc/NEWS               |    2 +
  4 files changed, 14 insertions(+), 298 deletions(-)


diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -763,20 +763,6 @@
         print(count(len(skipped), "test"), "skipped:")
         printlist(skipped)
 
-        e = _ExpectedSkips()
-        plat = sys.platform
-        if e.isvalid():
-            surprise = set(skipped) - e.getexpected() - set(resource_denieds)
-            if surprise:
-                print(count(len(surprise), "skip"), \
-                      "unexpected on", plat + ":")
-                printlist(surprise)
-            else:
-                print("Those skips are all expected on", plat + ".")
-        else:
-            print("Ask someone to teach regrtest.py about which tests are")
-            print("expected to get skipped on", plat + ".")
-
     if verbose2 and bad:
         print("Re-running failed tests in verbose mode")
         for test in bad:
@@ -1470,285 +1456,6 @@
     print(fill(' '.join(str(elt) for elt in sorted(x)), width,
                initial_indent=blanks, subsequent_indent=blanks))
 
-# Map sys.platform to a string containing the basenames of tests
-# expected to be skipped on that platform.
-#
-# Special cases:
-#     test_pep277
-#         The _ExpectedSkips constructor adds this to the set of expected
-#         skips if not os.path.supports_unicode_filenames.
-#     test_timeout
-#         Controlled by test_timeout.skip_expected.  Requires the network
-#         resource and a socket module.
-#
-# Tests that are expected to be skipped everywhere except on one platform
-# are also handled separately.
-
-_expectations = (
-    ('win32',
-        """
-        test__locale
-        test_crypt
-        test_curses
-        test_dbm
-        test_devpoll
-        test_fcntl
-        test_fork1
-        test_epoll
-        test_dbm_gnu
-        test_dbm_ndbm
-        test_grp
-        test_ioctl
-        test_largefile
-        test_kqueue
-        test_openpty
-        test_ossaudiodev
-        test_pipes
-        test_poll
-        test_posix
-        test_pty
-        test_pwd
-        test_resource
-        test_signal
-        test_syslog
-        test_threadsignals
-        test_wait3
-        test_wait4
-        """),
-    ('linux',
-        """
-        test_curses
-        test_devpoll
-        test_largefile
-        test_kqueue
-        test_ossaudiodev
-        """),
-    ('unixware',
-        """
-        test_epoll
-        test_largefile
-        test_kqueue
-        test_minidom
-        test_openpty
-        test_pyexpat
-        test_sax
-        test_sundry
-        """),
-    ('openunix',
-        """
-        test_epoll
-        test_largefile
-        test_kqueue
-        test_minidom
-        test_openpty
-        test_pyexpat
-        test_sax
-        test_sundry
-        """),
-    ('sco_sv',
-        """
-        test_asynchat
-        test_fork1
-        test_epoll
-        test_gettext
-        test_largefile
-        test_locale
-        test_kqueue
-        test_minidom
-        test_openpty
-        test_pyexpat
-        test_queue
-        test_sax
-        test_sundry
-        test_thread
-        test_threaded_import
-        test_threadedtempfile
-        test_threading
-        """),
-    ('darwin',
-        """
-        test__locale
-        test_curses
-        test_devpoll
-        test_epoll
-        test_dbm_gnu
-        test_gdb
-        test_largefile
-        test_locale
-        test_minidom
-        test_ossaudiodev
-        test_poll
-        """),
-    ('sunos',
-        """
-        test_curses
-        test_dbm
-        test_epoll
-        test_kqueue
-        test_dbm_gnu
-        test_gzip
-        test_openpty
-        test_zipfile
-        test_zlib
-        """),
-    ('hp-ux',
-        """
-        test_curses
-        test_epoll
-        test_dbm_gnu
-        test_gzip
-        test_largefile
-        test_locale
-        test_kqueue
-        test_minidom
-        test_openpty
-        test_pyexpat
-        test_sax
-        test_zipfile
-        test_zlib
-        """),
-    ('cygwin',
-        """
-        test_curses
-        test_dbm
-        test_devpoll
-        test_epoll
-        test_ioctl
-        test_kqueue
-        test_largefile
-        test_locale
-        test_ossaudiodev
-        test_socketserver
-        """),
-    ('freebsd',
-        """
-        test_devpoll
-        test_epoll
-        test_dbm_gnu
-        test_locale
-        test_ossaudiodev
-        test_pep277
-        test_pty
-        test_socketserver
-        test_tcl
-        test_tk
-        test_ttk_guionly
-        test_ttk_textonly
-        test_timeout
-        test_urllibnet
-        test_multiprocessing
-        """),
-    ('aix',
-        """
-        test_bz2
-        test_epoll
-        test_dbm_gnu
-        test_gzip
-        test_kqueue
-        test_ossaudiodev
-        test_tcl
-        test_tk
-        test_ttk_guionly
-        test_ttk_textonly
-        test_zipimport
-        test_zlib
-        """),
-    ('openbsd',
-        """
-        test_ctypes
-        test_devpoll
-        test_epoll
-        test_dbm_gnu
-        test_locale
-        test_normalization
-        test_ossaudiodev
-        test_pep277
-        test_tcl
-        test_tk
-        test_ttk_guionly
-        test_ttk_textonly
-        test_multiprocessing
-        """),
-    ('netbsd',
-        """
-        test_ctypes
-        test_curses
-        test_devpoll
-        test_epoll
-        test_dbm_gnu
-        test_locale
-        test_ossaudiodev
-        test_pep277
-        test_tcl
-        test_tk
-        test_ttk_guionly
-        test_ttk_textonly
-        test_multiprocessing
-        """),
-)
-
-class _ExpectedSkips:
-    def __init__(self):
-        import os.path
-        from test import test_timeout
-
-        self.valid = False
-        expected = None
-        for item in _expectations:
-            if sys.platform.startswith(item[0]):
-                expected = item[1]
-                break
-        if expected is not None:
-            self.expected = set(expected.split())
-
-            # These are broken tests, for now skipped on every platform.
-            # XXX Fix these!
-            self.expected.add('test_nis')
-
-            # expected to be skipped on every platform, even Linux
-            if not os.path.supports_unicode_filenames:
-                self.expected.add('test_pep277')
-
-            # doctest, profile and cProfile tests fail when the codec for the
-            # fs encoding isn't built in because PyUnicode_Decode() adds two
-            # calls into Python.
-            encs = ("utf-8", "latin-1", "ascii", "mbcs", "utf-16", "utf-32")
-            if sys.getfilesystemencoding().lower() not in encs:
-                self.expected.add('test_profile')
-                self.expected.add('test_cProfile')
-                self.expected.add('test_doctest')
-
-            if test_timeout.skip_expected:
-                self.expected.add('test_timeout')
-
-            if sys.platform != "win32":
-                # test_sqlite is only reliable on Windows where the library
-                # is distributed with Python
-                WIN_ONLY = {"test_unicode_file", "test_winreg",
-                            "test_winsound", "test_startfile",
-                            "test_sqlite", "test_msilib"}
-                self.expected |= WIN_ONLY
-
-            if sys.platform != 'sunos5':
-                self.expected.add('test_nis')
-
-            if support.python_is_optimized():
-                self.expected.add("test_gdb")
-
-            self.valid = True
-
-    def isvalid(self):
-        "Return true iff _ExpectedSkips knows about the current platform."
-        return self.valid
-
-    def getexpected(self):
-        """Return set of test names we expect to skip on current platform.
-
-        self.isvalid() must be true.
-        """
-
-        assert self.isvalid()
-        return self.expected
 
 def _make_temp_dir_for_build(TEMPDIR):
     # When tests are run from the Python build directory, it is best practice
diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -93,7 +93,8 @@
     """Context manager to suppress package and module deprecation
     warnings when importing them.
 
-    If ignore is False, this context manager has no effect."""
+    If ignore is False, this context manager has no effect.
+    """
     if ignore:
         with warnings.catch_warnings():
             warnings.filterwarnings("ignore", ".+ (module|package)",
@@ -103,23 +104,29 @@
         yield
 
 
-def import_module(name, deprecated=False):
+def import_module(name, deprecated=False, *, required_on=()):
     """Import and return the module to be tested, raising SkipTest if
     it is not available.
 
     If deprecated is True, any module or package deprecation messages
-    will be suppressed."""
+    will be suppressed. If a module is required on a platform but optional for
+    others, set required_on to an iterable of platform prefixes which will be
+    compared against sys.platform.
+    """
     with _ignore_deprecated_imports(deprecated):
         try:
             return importlib.import_module(name)
         except ImportError as msg:
+            if sys.platform.startswith(tuple(required_on)):
+                raise
             raise unittest.SkipTest(str(msg))
 
 
 def _save_and_remove_module(name, orig_modules):
     """Helper function to save and remove a module from sys.modules
 
-       Raise ImportError if the module can't be imported."""
+       Raise ImportError if the module can't be imported.
+       """
     # try to import the module and raise an error if it can't be imported
     if name not in sys.modules:
         __import__(name)
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -8,7 +8,7 @@
 from platform import machine
 
 # Do this first so test will be skipped if module doesn't exist
-support.import_module('winreg')
+support.import_module('winreg', required_on=['win'])
 # Now import everything
 from winreg import *
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -423,6 +423,8 @@
 Tools/Demos
 -----------
 
+- Issue #10966: Remove the concept of unexpected skipped tests.
+
 - Issue #9893: Removed the Misc/Vim directory.
 
 - Removed the Misc/TextMate directory.

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

From solipsis at pitrou.net  Sun Nov 18 05:57:15 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 18 Nov 2012 05:57:15 +0100
Subject: [Python-checkins] Daily reference leaks (eb3714863872): sum=0
Message-ID: <E1TZwwV-0000Zk-JH@ap.vmr.nerim.net>

results for eb3714863872 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Sun Nov 18 11:21:02 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:21:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEyMDA1?=
 =?utf-8?q?=3A_clarify_behaviour_of_=25_and_//_for_Decimal_objects=2E?=
Message-ID: <3Y48My0vXSzQQB@mail.python.org>

http://hg.python.org/cpython/rev/290f3b75480f
changeset:   80487:290f3b75480f
branch:      2.7
parent:      80485:eba28506eed3
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:20:28 2012 +0000
summary:
  Issue #12005: clarify behaviour of % and // for Decimal objects.

files:
  Doc/library/decimal.rst |  23 +++++++++++++++++++++++
  1 files changed, 23 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
@@ -375,6 +375,29 @@
    compared, sorted, and coerced to another type (such as :class:`float` or
    :class:`long`).
 
+   There are some small differences between arithmetic on Decimal objects and
+   arithmetic on integers and floats.  When the remainder operator ``%`` is
+   applied to Decimal objects, the sign of the result is the sign of the
+   *dividend* rather than the sign of the divisor::
+
+      >>> (-7) % 4
+      1
+      >>> Decimal(-7) % Decimal(4)
+      Decimal('-3')
+
+   The integer division operator ``//`` behaves analogously, returning the
+   integer part of the true quotient (truncating towards zero) rather than its
+   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+
+      >>> -7 // 4
+      -2
+      >>> Decimal(-7) // Decimal(4)
+      Decimal('-1')
+
+   The ``%`` and ``//`` operators implement the ``remainder`` and
+   ``divide-integer`` operations (respectively) as described in the
+   specification.
+
    Decimal objects cannot generally be combined with floats in
    arithmetic operations: an attempt to add a :class:`Decimal` to a
    :class:`float`, for example, will raise a :exc:`TypeError`.

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

From python-checkins at python.org  Sun Nov 18 11:23:16 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:23:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzEyMDA1?=
 =?utf-8?q?=3A_clarify_behaviour_of_=25_and_//_for_Decimal_objects=2E?=
Message-ID: <3Y48QX2YSVzQQB@mail.python.org>

http://hg.python.org/cpython/rev/0ec314f26791
changeset:   80488:0ec314f26791
branch:      3.2
parent:      80482:d51d95c9ea81
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:22:05 2012 +0000
summary:
  Issue #12005: clarify behaviour of % and // for Decimal objects.

files:
  Doc/library/decimal.rst |  23 +++++++++++++++++++++++
  1 files changed, 23 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
@@ -365,6 +365,29 @@
    compared, sorted, and coerced to another type (such as :class:`float` or
    :class:`int`).
 
+   There are some small differences between arithmetic on Decimal objects and
+   arithmetic on integers and floats.  When the remainder operator ``%`` is
+   applied to Decimal objects, the sign of the result is the sign of the
+   *dividend* rather than the sign of the divisor::
+
+      >>> (-7) % 4
+      1
+      >>> Decimal(-7) % Decimal(4)
+      Decimal('-3')
+
+   The integer division operator ``//`` behaves analogously, returning the
+   integer part of the true quotient (truncating towards zero) rather than its
+   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+
+      >>> -7 // 4
+      -2
+      >>> Decimal(-7) // Decimal(4)
+      Decimal('-1')
+
+   The ``%`` and ``//`` operators implement the ``remainder`` and
+   ``divide-integer`` operations (respectively) as described in the
+   specification.
+
    Decimal objects cannot generally be combined with floats or
    instances of :class:`fractions.Fraction` in arithmetic operations:
    an attempt to add a :class:`Decimal` to a :class:`float`, for

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

From python-checkins at python.org  Sun Nov 18 11:23:17 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:23:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2312005=3A_merge_doc_patch_from_3=2E2?=
Message-ID: <3Y48QY5LhFzQT3@mail.python.org>

http://hg.python.org/cpython/rev/f626c214cad0
changeset:   80489:f626c214cad0
branch:      3.3
parent:      80483:27cb1a3d57c8
parent:      80488:0ec314f26791
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:22:40 2012 +0000
summary:
  Issue #12005: merge doc patch from 3.2

files:
  Doc/library/decimal.rst |  23 +++++++++++++++++++++++
  1 files changed, 23 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
@@ -400,6 +400,29 @@
    compared, sorted, and coerced to another type (such as :class:`float` or
    :class:`int`).
 
+   There are some small differences between arithmetic on Decimal objects and
+   arithmetic on integers and floats.  When the remainder operator ``%`` is
+   applied to Decimal objects, the sign of the result is the sign of the
+   *dividend* rather than the sign of the divisor::
+
+      >>> (-7) % 4
+      1
+      >>> Decimal(-7) % Decimal(4)
+      Decimal('-3')
+
+   The integer division operator ``//`` behaves analogously, returning the
+   integer part of the true quotient (truncating towards zero) rather than its
+   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+
+      >>> -7 // 4
+      -2
+      >>> Decimal(-7) // Decimal(4)
+      Decimal('-1')
+
+   The ``%`` and ``//`` operators implement the ``remainder`` and
+   ``divide-integer`` operations (respectively) as described in the
+   specification.
+
    Decimal objects cannot generally be combined with floats or
    instances of :class:`fractions.Fraction` in arithmetic operations:
    an attempt to add a :class:`Decimal` to a :class:`float`, for

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

From python-checkins at python.org  Sun Nov 18 11:23:19 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:23:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2312005=3A_merge_doc_patch_from_3=2E3?=
Message-ID: <3Y48Qb0cvRzQV9@mail.python.org>

http://hg.python.org/cpython/rev/0263d2ef9530
changeset:   80490:0263d2ef9530
parent:      80486:eb3714863872
parent:      80489:f626c214cad0
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:22:51 2012 +0000
summary:
  Issue #12005: merge doc patch from 3.3

files:
  Doc/library/decimal.rst |  23 +++++++++++++++++++++++
  1 files changed, 23 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
@@ -400,6 +400,29 @@
    compared, sorted, and coerced to another type (such as :class:`float` or
    :class:`int`).
 
+   There are some small differences between arithmetic on Decimal objects and
+   arithmetic on integers and floats.  When the remainder operator ``%`` is
+   applied to Decimal objects, the sign of the result is the sign of the
+   *dividend* rather than the sign of the divisor::
+
+      >>> (-7) % 4
+      1
+      >>> Decimal(-7) % Decimal(4)
+      Decimal('-3')
+
+   The integer division operator ``//`` behaves analogously, returning the
+   integer part of the true quotient (truncating towards zero) rather than its
+   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+
+      >>> -7 // 4
+      -2
+      >>> Decimal(-7) // Decimal(4)
+      Decimal('-1')
+
+   The ``%`` and ``//`` operators implement the ``remainder`` and
+   ``divide-integer`` operations (respectively) as described in the
+   specification.
+
    Decimal objects cannot generally be combined with floats or
    instances of :class:`fractions.Fraction` in arithmetic operations:
    an attempt to add a :class:`Decimal` to a :class:`float`, for

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

From python-checkins at python.org  Sun Nov 18 11:42:58 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:42:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogVHlwbyBmaXgu?=
Message-ID: <3Y48sG2y5GzQKB@mail.python.org>

http://hg.python.org/cpython/rev/6240e78690bd
changeset:   80491:6240e78690bd
branch:      2.7
parent:      80487:290f3b75480f
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:41:29 2012 +0000
summary:
  Typo fix.

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


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -387,7 +387,7 @@
 
    The integer division operator ``//`` behaves analogously, returning the
    integer part of the true quotient (truncating towards zero) rather than its
-   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+   floor, so as to preserve the usual identity ``x == (x // y) * y + x % y``::
 
       >>> -7 // 4
       -2

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

From python-checkins at python.org  Sun Nov 18 11:42:59 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:42:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogVHlwbyBmaXgu?=
Message-ID: <3Y48sH5Fm1zQKB@mail.python.org>

http://hg.python.org/cpython/rev/7383f733ba25
changeset:   80492:7383f733ba25
branch:      3.2
parent:      80488:0ec314f26791
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:42:07 2012 +0000
summary:
  Typo fix.

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


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -377,7 +377,7 @@
 
    The integer division operator ``//`` behaves analogously, returning the
    integer part of the true quotient (truncating towards zero) rather than its
-   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+   floor, so as to preserve the usual identity ``x == (x // y) * y + x % y``::
 
       >>> -7 // 4
       -2

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

From python-checkins at python.org  Sun Nov 18 11:43:01 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:43:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_typo_fix_from_3=2E2=2E?=
Message-ID: <3Y48sK0cyCzQSv@mail.python.org>

http://hg.python.org/cpython/rev/e6d0f6485767
changeset:   80493:e6d0f6485767
branch:      3.3
parent:      80489:f626c214cad0
parent:      80492:7383f733ba25
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:42:27 2012 +0000
summary:
  Merge typo fix from 3.2.

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


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -412,7 +412,7 @@
 
    The integer division operator ``//`` behaves analogously, returning the
    integer part of the true quotient (truncating towards zero) rather than its
-   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+   floor, so as to preserve the usual identity ``x == (x // y) * y + x % y``::
 
       >>> -7 // 4
       -2

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

From python-checkins at python.org  Sun Nov 18 11:43:02 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 18 Nov 2012 11:43:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_typo_fix_from_3=2E3=2E?=
Message-ID: <3Y48sL30jdzQTp@mail.python.org>

http://hg.python.org/cpython/rev/a0421b30a841
changeset:   80494:a0421b30a841
parent:      80490:0263d2ef9530
parent:      80493:e6d0f6485767
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 18 10:42:42 2012 +0000
summary:
  Merge typo fix from 3.3.

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


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -412,7 +412,7 @@
 
    The integer division operator ``//`` behaves analogously, returning the
    integer part of the true quotient (truncating towards zero) rather than its
-   floor, so as to preseve the usual identity ``x == (x // y) * y + x % y``::
+   floor, so as to preserve the usual identity ``x == (x // y) * y + x % y``::
 
       >>> -7 // 4
       -2

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

From python-checkins at python.org  Sun Nov 18 11:56:45 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 11:56:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MDUzOiBkb2N1?=
 =?utf-8?q?ment_csv=2EDialect=2Estrict=2E__Patch_by_Kushal_Das=2E?=
Message-ID: <3Y499920t2zQTH@mail.python.org>

http://hg.python.org/cpython/rev/9b6797631490
changeset:   80495:9b6797631490
branch:      2.7
parent:      80491:6240e78690bd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 12:55:35 2012 +0200
summary:
  #16053: document csv.Dialect.strict.  Patch by Kushal Das.

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


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -355,6 +355,11 @@
    The default is :const:`False`.
 
 
+.. attribute:: Dialect.strict
+
+   When ``True``, raise exception :exc:`Error` on bad CSV input.
+   The default is ``False``.
+
 Reader Objects
 --------------
 

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

From python-checkins at python.org  Sun Nov 18 11:56:46 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 11:56:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDUzOiBkb2N1?=
 =?utf-8?q?ment_csv=2EDialect=2Estrict=2E__Patch_by_Kushal_Das=2E?=
Message-ID: <3Y499B4DBjzQM1@mail.python.org>

http://hg.python.org/cpython/rev/faf6941ed5fd
changeset:   80496:faf6941ed5fd
branch:      3.2
parent:      80492:7383f733ba25
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 12:55:35 2012 +0200
summary:
  #16053: document csv.Dialect.strict.  Patch by Kushal Das.

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


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -341,6 +341,11 @@
    The default is :const:`False`.
 
 
+.. attribute:: Dialect.strict
+
+   When ``True``, raise exception :exc:`Error` on bad CSV input.
+   The default is ``False``.
+
 Reader Objects
 --------------
 

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

From python-checkins at python.org  Sun Nov 18 11:56:47 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 11:56:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316053=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y499C6RRnzQRW@mail.python.org>

http://hg.python.org/cpython/rev/1956bc3edbb7
changeset:   80497:1956bc3edbb7
branch:      3.3
parent:      80493:e6d0f6485767
parent:      80496:faf6941ed5fd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 12:56:17 2012 +0200
summary:
  #16053: merge with 3.2.

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


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -341,6 +341,11 @@
    The default is :const:`False`.
 
 
+.. attribute:: Dialect.strict
+
+   When ``True``, raise exception :exc:`Error` on bad CSV input.
+   The default is ``False``.
+
 Reader Objects
 --------------
 

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

From python-checkins at python.org  Sun Nov 18 11:56:49 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 11:56:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MDUzOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y499F1ZpDzQRW@mail.python.org>

http://hg.python.org/cpython/rev/cb7953ba03af
changeset:   80498:cb7953ba03af
parent:      80494:a0421b30a841
parent:      80497:1956bc3edbb7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 12:56:31 2012 +0200
summary:
  #16053: merge with 3.3.

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


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -341,6 +341,11 @@
    The default is :const:`False`.
 
 
+.. attribute:: Dialect.strict
+
+   When ``True``, raise exception :exc:`Error` on bad CSV input.
+   The default is ``False``.
+
 Reader Objects
 --------------
 

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

From python-checkins at python.org  Sun Nov 18 12:23:10 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 12:23:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE0MzEzOiB6aXBm?=
 =?utf-8?q?ile_now_raises_NotImplementedError_when_the_compression_type_is?=
Message-ID: <3Y49lf4QXSzQT7@mail.python.org>

http://hg.python.org/cpython/rev/8feaa8d04c56
changeset:   80499:8feaa8d04c56
branch:      2.7
parent:      80495:9b6797631490
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 13:18:06 2012 +0200
summary:
  #14313: zipfile now raises NotImplementedError when the compression type is unknown.

files:
  Lib/test/test_zipfile.py |  11 +++++++++++
  Lib/zipfile.py           |  28 ++++++++++++++++++++++++++++
  Misc/NEWS                |   3 +++
  3 files changed, 42 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -859,6 +859,17 @@
         caught."""
         self.assertRaises(RuntimeError, zipfile.ZipFile, TESTFN, "w", -1)
 
+    def test_unsupported_compression(self):
+        # data is declared as shrunk, but actually deflated
+        data = (b'PK\x03\x04.\x00\x00\x00\x01\x00\xe4C\xa1@\x00\x00\x00'
+        b'\x00\x02\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00x\x03\x00PK\x01'
+        b'\x02.\x03.\x00\x00\x00\x01\x00\xe4C\xa1@\x00\x00\x00\x00\x02\x00\x00'
+        b'\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+        b'\x80\x01\x00\x00\x00\x00xPK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x00'
+        b'/\x00\x00\x00!\x00\x00\x00\x00\x00')
+        with zipfile.ZipFile(io.BytesIO(data), 'r') as zipf:
+            self.assertRaises(NotImplementedError, zipf.open, 'x')
+
     def test_null_byte_in_filename(self):
         """Check that a filename containing a null byte is properly
         terminated."""
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -461,6 +461,28 @@
         self._UpdateKeys(c)
         return c
 
+
+compressor_names = {
+    0: 'store',
+    1: 'shrink',
+    2: 'reduce',
+    3: 'reduce',
+    4: 'reduce',
+    5: 'reduce',
+    6: 'implode',
+    7: 'tokenize',
+    8: 'deflate',
+    9: 'deflate64',
+    10: 'implode',
+    12: 'bzip2',
+    14: 'lzma',
+    18: 'terse',
+    19: 'lz77',
+    97: 'wavpack',
+    98: 'ppmd',
+}
+
+
 class ZipExtFile(io.BufferedIOBase):
     """File-like object for reading an archive member.
        Is returned by ZipFile.open().
@@ -487,6 +509,12 @@
 
         if self._compress_type == ZIP_DEFLATED:
             self._decompressor = zlib.decompressobj(-15)
+        elif self._compress_type != ZIP_STORED:
+            descr = compressor_names.get(self._compress_type)
+            if descr:
+                raise NotImplementedError("compression type %d (%s)" % (self._compress_type, descr))
+            else:
+                raise NotImplementedError("compression type %d" % (self._compress_type,))
         self._unconsumed = ''
 
         self._readbuffer = ''
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -148,6 +148,9 @@
 Library
 -------
 
+- Issue #14313: zipfile now raises NotImplementedError when the compression
+  type is unknown.
+
 - Issue #16408: Fix file descriptors not being closed in error conditions
   in the zipfile module.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Sun Nov 18 12:23:11 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 12:23:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE0MzEzOiB6aXBm?=
 =?utf-8?q?ile_now_raises_NotImplementedError_when_the_compression_type_is?=
Message-ID: <3Y49lg6twVzQdQ@mail.python.org>

http://hg.python.org/cpython/rev/b193a5dc7a58
changeset:   80500:b193a5dc7a58
branch:      3.2
parent:      80496:faf6941ed5fd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 13:20:36 2012 +0200
summary:
  #14313: zipfile now raises NotImplementedError when the compression type is unknown.

files:
  Lib/test/test_zipfile.py |  11 +++++++++++
  Lib/zipfile.py           |  28 ++++++++++++++++++++++++++++
  Misc/NEWS                |   3 +++
  3 files changed, 42 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -922,6 +922,17 @@
         caught."""
         self.assertRaises(RuntimeError, zipfile.ZipFile, TESTFN, "w", -1)
 
+    def test_unsupported_compression(self):
+        # data is declared as shrunk, but actually deflated
+        data = (b'PK\x03\x04.\x00\x00\x00\x01\x00\xe4C\xa1@\x00\x00\x00'
+        b'\x00\x02\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00x\x03\x00PK\x01'
+        b'\x02.\x03.\x00\x00\x00\x01\x00\xe4C\xa1@\x00\x00\x00\x00\x02\x00\x00'
+        b'\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+        b'\x80\x01\x00\x00\x00\x00xPK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x00'
+        b'/\x00\x00\x00!\x00\x00\x00\x00\x00')
+        with zipfile.ZipFile(io.BytesIO(data), 'r') as zipf:
+            self.assertRaises(NotImplementedError, zipf.open, 'x')
+
     def test_null_byte_in_filename(self):
         """Check that a filename containing a null byte is properly
         terminated."""
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -461,6 +461,28 @@
         self._UpdateKeys(c)
         return c
 
+
+compressor_names = {
+    0: 'store',
+    1: 'shrink',
+    2: 'reduce',
+    3: 'reduce',
+    4: 'reduce',
+    5: 'reduce',
+    6: 'implode',
+    7: 'tokenize',
+    8: 'deflate',
+    9: 'deflate64',
+    10: 'implode',
+    12: 'bzip2',
+    14: 'lzma',
+    18: 'terse',
+    19: 'lz77',
+    97: 'wavpack',
+    98: 'ppmd',
+}
+
+
 class ZipExtFile(io.BufferedIOBase):
     """File-like object for reading an archive member.
        Is returned by ZipFile.open().
@@ -487,6 +509,12 @@
 
         if self._compress_type == ZIP_DEFLATED:
             self._decompressor = zlib.decompressobj(-15)
+        elif self._compress_type != ZIP_STORED:
+            descr = compressor_names.get(self._compress_type)
+            if descr:
+                raise NotImplementedError("compression type %d (%s)" % (self._compress_type, descr))
+            else:
+                raise NotImplementedError("compression type %d" % (self._compress_type,))
         self._unconsumed = b''
 
         self._readbuffer = b''
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -164,6 +164,9 @@
 Library
 -------
 
+- Issue #14313: zipfile now raises NotImplementedError when the compression
+  type is unknown.
+
 - Issue #16408: Fix file descriptors not being closed in error conditions
   in the zipfile module.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Sun Nov 18 12:23:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 12:23:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2314313=3A_null_merge=2E?=
Message-ID: <3Y49lj2D1vzQKm@mail.python.org>

http://hg.python.org/cpython/rev/c2ba10b9d654
changeset:   80501:c2ba10b9d654
branch:      3.3
parent:      80497:1956bc3edbb7
parent:      80500:b193a5dc7a58
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 13:22:34 2012 +0200
summary:
  #14313: null merge.

files:



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

From python-checkins at python.org  Sun Nov 18 12:23:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 12:23:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_=2314313=3A_null_merge=2E?=
Message-ID: <3Y49lk4gWxzQR9@mail.python.org>

http://hg.python.org/cpython/rev/4b866e39d1fb
changeset:   80502:4b866e39d1fb
parent:      80498:cb7953ba03af
parent:      80501:c2ba10b9d654
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 13:22:55 2012 +0200
summary:
  #14313: null merge.

files:



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

From python-checkins at python.org  Sun Nov 18 13:07:15 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 13:07:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzA2OiBGaXgg?=
 =?utf-8?q?multiple_error_messages_when_unknown_command_line_parameters_wh?=
 =?utf-8?q?ere?=
Message-ID: <3Y4BkW4ZBXzQQB@mail.python.org>

http://hg.python.org/cpython/rev/d2df83d7c649
changeset:   80503:d2df83d7c649
branch:      2.7
parent:      80499:8feaa8d04c56
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 13:46:38 2012 +0200
summary:
  #16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter.  Patch by Hieu Nguyen.

files:
  Lib/test/test_cmd_line.py |  11 ++++++++++-
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   3 +++
  Python/getopt.c           |  14 ++++++++------
  4 files changed, 22 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -6,7 +6,8 @@
 import sys
 import unittest
 from test.script_helper import (
-    assert_python_ok, spawn_python, kill_python, python_exit_code
+    assert_python_ok, assert_python_failure, spawn_python, kill_python,
+    python_exit_code
 )
 
 
@@ -116,6 +117,14 @@
         assert_python_ok(filename)
 
 
+    def test_unknown_options(self):
+        # Add "without='-E'" to prevent _assert_python append env_vars -E
+        # which changes the output of stderr
+        rc, out, err = assert_python_failure('-z', without='-E')
+        self.assertIn(b'Unknown option', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+
 def test_main():
     test.test_support.run_unittest(CmdLineTest)
     test.test_support.reap_children()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -701,6 +701,7 @@
 Chad Netzer
 Max Neunh?ffer
 George Neville-Neil
+Hieu Nguyen
 Johannes Nicolai
 Samuel Nicolary
 Gustavo Niemeyer
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16306: Fix multiple error messages when unknown command line
+  parameters where passed to the interpreter.  Patch by Hieu Nguyen.
+
 - 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/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -41,7 +41,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 1;
+    _PyOS_opterr = 0;   /* prevent printing the error in 2nd loop in main.c */
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = "";
@@ -86,17 +86,19 @@
         opt_ptr = &argv[_PyOS_optind++][1];
     }
 
-    if ( (option = *opt_ptr++) == '\0')
+    if ((option = *opt_ptr++) == '\0')
         return -1;
 
     if (option == 'J') {
-        fprintf(stderr, "-J is reserved for Jython\n");
+        if (_PyOS_opterr)
+            fprintf(stderr, "-J is reserved for Jython\n");
         return '_';
     }
 
     if (option == 'X') {
-        fprintf(stderr,
-          "-X is reserved for implementation-specific arguments\n");
+        if (_PyOS_opterr)
+            fprintf(stderr,
+                "-X is reserved for implementation-specific arguments\n");
         return '_';
     }
 
@@ -117,7 +119,7 @@
             if (_PyOS_optind >= argc) {
                 if (_PyOS_opterr)
                     fprintf(stderr,
-                "Argument expected for the -%c option\n", option);
+                        "Argument expected for the -%c option\n", option);
                 return '_';
             }
 

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

From python-checkins at python.org  Sun Nov 18 13:07:17 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 13:07:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MzA2OiBGaXgg?=
 =?utf-8?q?multiple_error_messages_when_unknown_command_line_parameters_wh?=
 =?utf-8?q?ere?=
Message-ID: <3Y4BkY091YzQT3@mail.python.org>

http://hg.python.org/cpython/rev/0153c077a0fd
changeset:   80504:0153c077a0fd
branch:      3.2
parent:      80500:b193a5dc7a58
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 13:55:52 2012 +0200
summary:
  #16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter.  Patch by Hieu Nguyen.

files:
  Lib/test/test_cmd_line.py |   9 ++++++++-
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   3 +++
  Python/getopt.c           |  10 +++++-----
  4 files changed, 17 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -7,7 +7,8 @@
 import sys
 import subprocess
 import tempfile
-from test.script_helper import spawn_python, kill_python, assert_python_ok, assert_python_failure
+from test.script_helper import (spawn_python, kill_python, assert_python_ok,
+    assert_python_failure)
 
 
 # XXX (ncoghlan): Move to script_helper and make consistent with run_python
@@ -376,6 +377,12 @@
         assert_python_ok(filename)
 
 
+    def test_unknown_options(self):
+        rc, out, err = assert_python_failure('-z', __cleanenv=True)
+        self.assertIn(b'Unknown option', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+
 def test_main():
     test.support.run_unittest(CmdLineTest)
     test.support.reap_children()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -757,6 +757,7 @@
 Chad Netzer
 Max Neunh?ffer
 George Neville-Neil
+Hieu Nguyen
 Johannes Nicolai
 Samuel Nicolary
 Gustavo Niemeyer
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16306: Fix multiple error messages when unknown command line
+  parameters where passed to the interpreter.  Patch by Hieu Nguyen.
+
 - Issue #16453: Fix equality testing of dead weakref objects.
 
 - Issue #9535: Fix pending signals that have been received but not yet
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 1;
+    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";
@@ -90,18 +90,18 @@
         opt_ptr = &argv[_PyOS_optind++][1];
     }
 
-    if ( (option = *opt_ptr++) == L'\0')
+    if ((option = *opt_ptr++) == L'\0')
         return -1;
 
     if (option == 'J') {
-        fprintf(stderr, "-J is reserved for Jython\n");
+        if (_PyOS_opterr)
+            fprintf(stderr, "-J is reserved for Jython\n");
         return '_';
     }
 
     if ((ptr = wcschr(optstring, option)) == NULL) {
         if (_PyOS_opterr)
-          fprintf(stderr, "Unknown option: -%c\n", (char)option);
-
+            fprintf(stderr, "Unknown option: -%c\n", (char)option);
         return '_';
     }
 

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

From python-checkins at python.org  Sun Nov 18 13:07:18 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 13:07:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316306=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y4BkZ2sMSzQZ9@mail.python.org>

http://hg.python.org/cpython/rev/7f01121a660d
changeset:   80505:7f01121a660d
branch:      3.3
parent:      80501:c2ba10b9d654
parent:      80504:0153c077a0fd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 14:02:08 2012 +0200
summary:
  #16306: merge with 3.2.

files:
  Lib/test/test_cmd_line.py |   9 ++++++++-
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   3 +++
  Python/getopt.c           |  10 +++++-----
  4 files changed, 17 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -7,7 +7,8 @@
 import sys
 import subprocess
 import tempfile
-from test.script_helper import spawn_python, kill_python, assert_python_ok, assert_python_failure
+from test.script_helper import (spawn_python, kill_python, assert_python_ok,
+    assert_python_failure)
 
 
 # XXX (ncoghlan): Move to script_helper and make consistent with run_python
@@ -370,6 +371,12 @@
         assert_python_ok(filename)
 
 
+    def test_unknown_options(self):
+        rc, out, err = assert_python_failure('-z', __cleanenv=True)
+        self.assertIn(b'Unknown option', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+
 def test_main():
     test.support.run_unittest(CmdLineTest)
     test.support.reap_children()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -835,6 +835,7 @@
 Chad Netzer
 Max Neunh?ffer
 George Neville-Neil
+Hieu Nguyen
 Johannes Nicolai
 Samuel Nicolary
 Jonathan Niehof
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16306: Fix multiple error messages when unknown command line
+  parameters where passed to the interpreter.  Patch by Hieu Nguyen.
+
 - Issue #16215: Fix potential double memory free in str.replace().  Patch
   by Serhiy Storchaka.
 
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 1;
+    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";
@@ -90,18 +90,18 @@
         opt_ptr = &argv[_PyOS_optind++][1];
     }
 
-    if ( (option = *opt_ptr++) == L'\0')
+    if ((option = *opt_ptr++) == L'\0')
         return -1;
 
     if (option == 'J') {
-        fprintf(stderr, "-J is reserved for Jython\n");
+        if (_PyOS_opterr)
+            fprintf(stderr, "-J is reserved for Jython\n");
         return '_';
     }
 
     if ((ptr = wcschr(optstring, option)) == NULL) {
         if (_PyOS_opterr)
-          fprintf(stderr, "Unknown option: -%c\n", (char)option);
-
+            fprintf(stderr, "Unknown option: -%c\n", (char)option);
         return '_';
     }
 

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

From python-checkins at python.org  Sun Nov 18 13:07:19 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 13:07:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MzA2OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y4Bkb59vWzQYj@mail.python.org>

http://hg.python.org/cpython/rev/3a1bcb6de167
changeset:   80506:3a1bcb6de167
parent:      80502:4b866e39d1fb
parent:      80505:7f01121a660d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 14:06:54 2012 +0200
summary:
  #16306: merge with 3.3.

files:
  Lib/test/test_cmd_line.py |   9 ++++++++-
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   3 +++
  Python/getopt.c           |  10 +++++-----
  4 files changed, 17 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -7,7 +7,8 @@
 import sys
 import subprocess
 import tempfile
-from test.script_helper import spawn_python, kill_python, assert_python_ok, assert_python_failure
+from test.script_helper import (spawn_python, kill_python, assert_python_ok,
+    assert_python_failure)
 
 
 # XXX (ncoghlan): Move to script_helper and make consistent with run_python
@@ -387,6 +388,12 @@
         assert_python_ok(filename)
 
 
+    def test_unknown_options(self):
+        rc, out, err = assert_python_failure('-z', __cleanenv=True)
+        self.assertIn(b'Unknown option', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+
 def test_main():
     test.support.run_unittest(CmdLineTest)
     test.support.reap_children()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -837,6 +837,7 @@
 Chad Netzer
 Max Neunh?ffer
 George Neville-Neil
+Hieu Nguyen
 Johannes Nicolai
 Samuel Nicolary
 Jonathan Niehof
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16306: Fix multiple error messages when unknown command line
+  parameters where passed to the interpreter.  Patch by Hieu Nguyen.
+
 - Issue #16215: Fix potential double memory free in str.replace().  Patch
   by Serhiy Storchaka.
 
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 1;
+    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";
@@ -90,18 +90,18 @@
         opt_ptr = &argv[_PyOS_optind++][1];
     }
 
-    if ( (option = *opt_ptr++) == L'\0')
+    if ((option = *opt_ptr++) == L'\0')
         return -1;
 
     if (option == 'J') {
-        fprintf(stderr, "-J is reserved for Jython\n");
+        if (_PyOS_opterr)
+            fprintf(stderr, "-J is reserved for Jython\n");
         return '_';
     }
 
     if ((ptr = wcschr(optstring, option)) == NULL) {
         if (_PyOS_opterr)
-          fprintf(stderr, "Unknown option: -%c\n", (char)option);
-
+            fprintf(stderr, "Unknown option: -%c\n", (char)option);
         return '_';
     }
 

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

From python-checkins at python.org  Sun Nov 18 16:03:47 2012
From: python-checkins at python.org (brett.cannon)
Date: Sun, 18 Nov 2012 16:03:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315627=3A_Add_the_?=
 =?utf-8?q?compile=5Fsource=28=29_method_to?=
Message-ID: <3Y4GfC6cPfzQYB@mail.python.org>

http://hg.python.org/cpython/rev/e30bcce5c634
changeset:   80507:e30bcce5c634
user:        Brett Cannon <brett at python.org>
date:        Sun Nov 18 10:03:31 2012 -0500
summary:
  Issue #15627: Add the compile_source() method to
importlib.abc.SourceLoader.

This provides an easy hook into the import system to allow for source
transformations, AST optimizations, etc.

files:
  Doc/library/importlib.rst                         |    17 +-
  Lib/importlib/_bootstrap.py                       |    12 +-
  Lib/test/test_importlib/source/test_abc_loader.py |    15 +-
  Misc/NEWS                                         |     2 +
  Python/importlib.h                                |  4718 +++++----
  5 files changed, 2404 insertions(+), 2360 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -364,10 +364,12 @@
     * :meth:`ResourceLoader.get_data`
     * :meth:`ExecutionLoader.get_filename`
           Should only return the path to the source file; sourceless
-          loading is not supported.
+          loading is not supported (see :class:`SourcelessLoader` if that
+          functionality is required)
 
     The abstract methods defined by this class are to add optional bytecode
-    file support. Not implementing these optional methods causes the loader to
+    file support. Not implementing these optional methods (or causing them to
+    raise :exc:`NotImplementedError`) causes the loader to
     only work with source code. Implementing the methods allows the loader to
     work with source *and* bytecode files; it does not allow for *sourceless*
     loading where only bytecode is provided.  Bytecode files are an
@@ -407,6 +409,17 @@
         When writing to the path fails because the path is read-only
         (:attr:`errno.EACCES`), do not propagate the exception.
 
+    .. method:: compile_source(data, path)
+
+        Create a code object from Python source.
+
+        The *data* argument can be whatever the :func:`compile` function
+        supports (i.e. string or bytes). The *path* argument should be
+        the "path" to where the source code originated from, which can be an
+        abstract concept (e.g. location in a zip file).
+
+        .. versionadded:: 3.4
+
     .. method:: get_code(fullname)
 
         Concrete implementation of :meth:`InspectLoader.get_code`.
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -931,6 +931,14 @@
             raise ImportError("Failed to decode source file",
                               name=fullname) from exc
 
+    def compile_source(self, data, path):
+        """Return the code object compiled from source.
+
+        The 'data' argument can be any object type that compile() supports.
+        """
+        return _call_with_frames_removed(compile, data, path, 'exec',
+                                        dont_inherit=True)
+
     def get_code(self, fullname):
         """Concrete implementation of InspectLoader.get_code.
 
@@ -976,9 +984,7 @@
                             raise ImportError(msg.format(bytecode_path),
                                               name=fullname, path=bytecode_path)
         source_bytes = self.get_data(source_path)
-        code_object = _call_with_frames_removed(compile,
-                          source_bytes, source_path, 'exec',
-                          dont_inherit=True)
+        code_object = self.compile_source(source_bytes, source_path)
         _verbose_message('code object from {}', source_path)
         if (not sys.dont_write_bytecode and bytecode_path is not None and
             source_mtime is not None):
diff --git a/Lib/test/test_importlib/source/test_abc_loader.py b/Lib/test/test_importlib/source/test_abc_loader.py
--- a/Lib/test/test_importlib/source/test_abc_loader.py
+++ b/Lib/test/test_importlib/source/test_abc_loader.py
@@ -148,6 +148,11 @@
         code_object = self.loader.get_code(self.name)
         self.verify_code(code_object)
 
+    def test_compile_source(self):
+        # Verify the compiled code object.
+        code = self.loader.compile_source(self.loader.source, self.path)
+        self.verify_code(code)
+
     def test_load_module(self):
         # Loading a module should set __name__, __loader__, __package__,
         # __path__ (for packages), __file__, and __cached__.
@@ -395,12 +400,10 @@
 
 def test_main():
     from test.support import run_unittest
-    run_unittest(SkipWritingBytecodeTests, RegeneratedBytecodeTests,
-                    BadBytecodeFailureTests, MissingPathsTests,
-                    SourceOnlyLoaderTests,
-                    SourceLoaderBytecodeTests,
-                    SourceLoaderGetSourceTests,
-                    AbstractMethodImplTests)
+    run_unittest(SourceOnlyLoaderTests,
+                 SourceLoaderBytecodeTests,
+                 SourceLoaderGetSourceTests,
+                 AbstractMethodImplTests)
 
 
 if __name__ == '__main__':
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -133,6 +133,8 @@
 Library
 -------
 
+- Issue #15627: Add the importlib.abc.SourceLoader.compile_source() method.
+
 - Issue #16408: Fix file descriptors not being closed in error conditions
   in the zipfile module.  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  Sun Nov 18 16:27:25 2012
From: python-checkins at python.org (brett.cannon)
Date: Sun, 18 Nov 2012 16:27:25 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Regen_importlib=2Eh?=
Message-ID: <3Y4H9T2HzFzRDl@mail.python.org>

http://hg.python.org/cpython/rev/96d1c3cf06b3
changeset:   80508:96d1c3cf06b3
user:        Brett Cannon <brett at python.org>
date:        Sun Nov 18 10:27:12 2012 -0500
summary:
  Regen importlib.h

files:
  Python/importlib.h |  4383 ++++++++++++++++---------------
  1 files changed, 2193 insertions(+), 2190 deletions(-)


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 Nov 18 18:38:55 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 18 Nov 2012 18:38:55 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_The_poplib_mod?=
 =?utf-8?q?ule_provides_two_classes=2C_not_one=2E?=
Message-ID: <3Y4L5C73s9zRMM@mail.python.org>

http://hg.python.org/cpython/rev/a47e5f1492ff
changeset:   80509:a47e5f1492ff
branch:      3.2
parent:      80504:0153c077a0fd
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 18 18:37:02 2012 +0100
summary:
  The poplib module provides two classes, not one.

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


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -24,7 +24,7 @@
 mailserver supports IMAP, you would be better off using the
 :class:`imaplib.IMAP4` class, as IMAP servers tend to be better implemented.
 
-A single class is provided by the :mod:`poplib` module:
+The :mod:`poplib` module provides two classes:
 
 
 .. class:: POP3(host, port=POP3_PORT[, timeout])

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

From python-checkins at python.org  Sun Nov 18 18:38:57 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 18 Nov 2012 18:38:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_The_poplib_module_provides_two_classes=2C_not_one=2E?=
Message-ID: <3Y4L5F2kqpzRMj@mail.python.org>

http://hg.python.org/cpython/rev/685ad2118802
changeset:   80510:685ad2118802
branch:      3.3
parent:      80505:7f01121a660d
parent:      80509:a47e5f1492ff
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 18 18:37:24 2012 +0100
summary:
  The poplib module provides two classes, not one.

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


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -24,7 +24,7 @@
 mailserver supports IMAP, you would be better off using the
 :class:`imaplib.IMAP4` class, as IMAP servers tend to be better implemented.
 
-A single class is provided by the :mod:`poplib` module:
+The :mod:`poplib` module provides two classes:
 
 
 .. class:: POP3(host, port=POP3_PORT[, timeout])

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

From python-checkins at python.org  Sun Nov 18 18:38:58 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 18 Nov 2012 18:38:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_The_poplib_module_provides_two_classes=2C_not_one=2E?=
Message-ID: <3Y4L5G5071zRN7@mail.python.org>

http://hg.python.org/cpython/rev/4def3c26dcf8
changeset:   80511:4def3c26dcf8
parent:      80508:96d1c3cf06b3
parent:      80510:685ad2118802
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 18 18:37:54 2012 +0100
summary:
  The poplib module provides two classes, not one.

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


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -24,7 +24,7 @@
 mailserver supports IMAP, you would be better off using the
 :class:`imaplib.IMAP4` class, as IMAP servers tend to be better implemented.
 
-A single class is provided by the :mod:`poplib` module:
+The :mod:`poplib` module provides two classes:
 
 
 .. class:: POP3(host, port=POP3_PORT[, timeout])

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

From python-checkins at python.org  Sun Nov 18 18:39:53 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 18 Nov 2012 18:39:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_The_poplib_mod?=
 =?utf-8?q?ule_provides_two_classes=2C_not_one=2E?=
Message-ID: <3Y4L6K1VvzzRMM@mail.python.org>

http://hg.python.org/cpython/rev/3ee1c797fd0f
changeset:   80512:3ee1c797fd0f
branch:      2.7
parent:      80503:d2df83d7c649
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Nov 18 18:37:02 2012 +0100
summary:
  The poplib module provides two classes, not one.

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


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -24,7 +24,7 @@
 mailserver supports IMAP, you would be better off using the
 :class:`imaplib.IMAP4` class, as IMAP servers tend to be better implemented.
 
-A single class is provided by the :mod:`poplib` module:
+The :mod:`poplib` module provides two classes:
 
 
 .. class:: POP3(host[, port[, timeout]])

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

From python-checkins at python.org  Sun Nov 18 18:55:21 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 18:55:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_=2316502=3A_fix_markup=2E__Pa?=
	=?utf-8?q?tch_by_Serhiy_Storchaka=2E?=
Message-ID: <3Y4LS90yp1zPwD@mail.python.org>

http://hg.python.org/peps/rev/55c706023fa2
changeset:   4589:55c706023fa2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 19:55:10 2012 +0200
summary:
  #16502: fix markup.  Patch by Serhiy Storchaka.

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


diff --git a/pep-0305.txt b/pep-0305.txt
--- a/pep-0305.txt
+++ b/pep-0305.txt
@@ -370,7 +370,7 @@
 5. What about end-of-line?  If I generate a CSV file on a Unix system,
    will Excel properly recognize the LF-only line terminators?  Files
    must be opened for reading or writing as appropriate using binary
-   mode.  Specify the ``lineterminator`` sequence as '\r\n'.  The
+   mode.  Specify the ``lineterminator`` sequence as ``'\r\n'``.  The
    resulting file will be written correctly.
 
 6. What about an option to generate dicts from the reader and accept

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

From python-checkins at python.org  Sun Nov 18 20:23:57 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 20:23:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NTAzOiBjbGFy?=
	=?utf-8?q?ify_=22apply=22_docs=2E?=
Message-ID: <3Y4NQP6jBwzRNd@mail.python.org>

http://hg.python.org/cpython/rev/7efa0d66b1a0
changeset:   80513:7efa0d66b1a0
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 21:23:44 2012 +0200
summary:
  #16503: clarify "apply" docs.

files:
  Doc/library/functions.rst |  3 ++-
  1 files changed, 2 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
@@ -1676,7 +1676,8 @@
    ``function(*args, **keywords)``.
 
    .. deprecated:: 2.3
-      Use the extended call syntax with ``*args`` and ``**keywords`` instead.
+      Use ``function(*args, **keywords)`` instead of
+      ``apply(function, args, keywords)`` (see :ref:`tut-unpacking-arguments`).
 
 
 .. function:: buffer(object[, offset[, size]])

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

From python-checkins at python.org  Sun Nov 18 22:16:17 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 22:16:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzc3ODI6IGFkZCBh?=
	=?utf-8?q?_test_for_test=5Fiter=2E?=
Message-ID: <3Y4Qw154JTzRR9@mail.python.org>

http://hg.python.org/cpython/rev/4624570c1f19
changeset:   80514:4624570c1f19
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 23:14:42 2012 +0200
summary:
  #7782: add a test for test_iter.

files:
  Lib/test/test_iter.py |  15 +++++++++++++++
  1 files changed, 15 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -908,6 +908,21 @@
         except TypeError:
             pass
 
+    def test_extending_list_with_iterator_does_not_segfault(self):
+        # The code to extend a list with an iterator has a fair
+        # amount of nontrivial logic in terms of guessing how
+        # much memory to allocate in advance, "stealing" refs,
+        # and then shrinking at the end.  This is a basic smoke
+        # test for that scenario.
+        def gen():
+            for i in range(500):
+                yield i
+        lst = [0] * 500
+        for i in range(240):
+            lst.pop(0)
+        lst.extend(gen())
+        self.assertEqual(len(lst), 760)
+
 
 def test_main():
     run_unittest(TestCase)

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

From python-checkins at python.org  Sun Nov 18 22:16:19 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 22:16:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzc3ODI6IGFkZCBh?=
	=?utf-8?q?_test_for_test=5Fiter=2E?=
Message-ID: <3Y4Qw30WDXzRSL@mail.python.org>

http://hg.python.org/cpython/rev/d2054aa9bed4
changeset:   80515:d2054aa9bed4
branch:      3.2
parent:      80509:a47e5f1492ff
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 23:14:42 2012 +0200
summary:
  #7782: add a test for test_iter.

files:
  Lib/test/test_iter.py |  15 +++++++++++++++
  1 files changed, 15 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -876,6 +876,21 @@
         except TypeError:
             pass
 
+    def test_extending_list_with_iterator_does_not_segfault(self):
+        # The code to extend a list with an iterator has a fair
+        # amount of nontrivial logic in terms of guessing how
+        # much memory to allocate in advance, "stealing" refs,
+        # and then shrinking at the end.  This is a basic smoke
+        # test for that scenario.
+        def gen():
+            for i in range(500):
+                yield i
+        lst = [0] * 500
+        for i in range(240):
+            lst.pop(0)
+        lst.extend(gen())
+        self.assertEqual(len(lst), 760)
+
 
 def test_main():
     run_unittest(TestCase)

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

From python-checkins at python.org  Sun Nov 18 22:16:20 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 22:16:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=237782=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y4Qw42gP3zRSs@mail.python.org>

http://hg.python.org/cpython/rev/0cc209d95e70
changeset:   80516:0cc209d95e70
branch:      3.3
parent:      80510:685ad2118802
parent:      80515:d2054aa9bed4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 23:15:47 2012 +0200
summary:
  #7782: merge with 3.2.

files:
  Lib/test/test_iter.py |  15 +++++++++++++++
  1 files changed, 15 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -903,6 +903,21 @@
         except TypeError:
             pass
 
+    def test_extending_list_with_iterator_does_not_segfault(self):
+        # The code to extend a list with an iterator has a fair
+        # amount of nontrivial logic in terms of guessing how
+        # much memory to allocate in advance, "stealing" refs,
+        # and then shrinking at the end.  This is a basic smoke
+        # test for that scenario.
+        def gen():
+            for i in range(500):
+                yield i
+        lst = [0] * 500
+        for i in range(240):
+            lst.pop(0)
+        lst.extend(gen())
+        self.assertEqual(len(lst), 760)
+
 
 def test_main():
     run_unittest(TestCase)

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

From python-checkins at python.org  Sun Nov 18 22:16:21 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 18 Nov 2012 22:16:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=237782=3A_merge_with_3=2E?=
	=?utf-8?q?3=2E?=
Message-ID: <3Y4Qw54xDlzRSw@mail.python.org>

http://hg.python.org/cpython/rev/d2b98a4c4251
changeset:   80517:d2b98a4c4251
parent:      80511:4def3c26dcf8
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 18 23:16:02 2012 +0200
summary:
  #7782: merge with 3.3.

files:
  Lib/test/test_iter.py |  15 +++++++++++++++
  1 files changed, 15 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -903,6 +903,21 @@
         except TypeError:
             pass
 
+    def test_extending_list_with_iterator_does_not_segfault(self):
+        # The code to extend a list with an iterator has a fair
+        # amount of nontrivial logic in terms of guessing how
+        # much memory to allocate in advance, "stealing" refs,
+        # and then shrinking at the end.  This is a basic smoke
+        # test for that scenario.
+        def gen():
+            for i in range(500):
+                yield i
+        lst = [0] * 500
+        for i in range(240):
+            lst.pop(0)
+        lst.extend(gen())
+        self.assertEqual(len(lst), 760)
+
 
 def test_main():
     run_unittest(TestCase)

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

From python-checkins at python.org  Mon Nov 19 00:08:39 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 19 Nov 2012 00:08:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=236308=3A_Try_to_fi?=
 =?utf-8?q?x_the_termios_build_failure_on_HP-UX=2E?=
Message-ID: <3Y4TPg6R9TzRHF@mail.python.org>

http://hg.python.org/cpython/rev/9dd4638de73b
changeset:   80518:9dd4638de73b
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 00:07:18 2012 +0100
summary:
  Issue #6308: Try to fix the termios build failure on HP-UX.

files:
  Include/pyport.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -646,7 +646,7 @@
 /* On QNX 6, struct termio must be declared by including sys/termio.h
    if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must
    be included before termios.h or it will generate an error. */
-#ifdef HAVE_SYS_TERMIO_H
+#if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux)
 #include <sys/termio.h>
 #endif
 

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

From python-checkins at python.org  Mon Nov 19 00:42:19 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 19 Nov 2012 00:42:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Null_merge=2E?=
Message-ID: <3Y4V8W6JDqzRK3@mail.python.org>

http://hg.python.org/cpython/rev/6b2a421403a5
changeset:   80519:6b2a421403a5
parent:      80518:9dd4638de73b
parent:      80516:0cc209d95e70
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 00:40:46 2012 +0100
summary:
  Null merge.

files:



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

From python-checkins at python.org  Mon Nov 19 00:44:52 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 19 Nov 2012 00:44:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_RISCOS_support_has_been_re?=
 =?utf-8?q?moved_a_long_time_ago=2E_Remove_last_remains_in?=
Message-ID: <3Y4VCS6v1zzN7j@mail.python.org>

http://hg.python.org/cpython/rev/ceb0184c7f44
changeset:   80520:ceb0184c7f44
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Nov 19 00:44:37 2012 +0100
summary:
  RISCOS support has been removed a long time ago. Remove last remains in sys.flags code. #16501 can be closed, too.

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


diff --git a/Python/sysmodule.c b/Python/sysmodule.c
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1349,9 +1349,6 @@
     {"no_site",                 "-S"},
     {"ignore_environment",      "-E"},
     {"verbose",                 "-v"},
-#ifdef RISCOS
-    {"riscos_wimp",             "???"},
-#endif
     /* {"unbuffered",                   "-u"}, */
     /* {"skip_first",                   "-x"}, */
     {"bytes_warning",           "-b"},
@@ -1364,11 +1361,7 @@
     "sys.flags",        /* name */
     flags__doc__,       /* doc */
     flags_fields,       /* fields */
-#ifdef RISCOS
-    13
-#else
     12
-#endif
 };
 
 static PyObject*
@@ -1393,9 +1386,6 @@
     SetFlag(Py_NoSiteFlag);
     SetFlag(Py_IgnoreEnvironmentFlag);
     SetFlag(Py_VerboseFlag);
-#ifdef RISCOS
-    SetFlag(Py_RISCOSWimpFlag);
-#endif
     /* SetFlag(saw_unbuffered_flag); */
     /* SetFlag(skipfirstline); */
     SetFlag(Py_BytesWarningFlag);

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

From python-checkins at python.org  Mon Nov 19 00:57:55 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 19 Nov 2012 00:57:55 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Backport_9dd46?=
	=?utf-8?q?38de73b=2E?=
Message-ID: <3Y4VVW0Fn9zRH4@mail.python.org>

http://hg.python.org/cpython/rev/90283c6f94fc
changeset:   80521:90283c6f94fc
branch:      3.3
parent:      80516:0cc209d95e70
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 00:54:05 2012 +0100
summary:
  Backport 9dd4638de73b.

files:
  Include/pyport.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -649,7 +649,7 @@
 /* On QNX 6, struct termio must be declared by including sys/termio.h
    if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must
    be included before termios.h or it will generate an error. */
-#ifdef HAVE_SYS_TERMIO_H
+#if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux)
 #include <sys/termio.h>
 #endif
 

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

From python-checkins at python.org  Mon Nov 19 00:57:56 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 19 Nov 2012 00:57:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Null_merge=2E?=
Message-ID: <3Y4VVX2lzDzRM3@mail.python.org>

http://hg.python.org/cpython/rev/129d8f50d045
changeset:   80522:129d8f50d045
parent:      80519:6b2a421403a5
parent:      80521:90283c6f94fc
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 00:54:50 2012 +0100
summary:
  Null merge.

files:



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

From python-checkins at python.org  Mon Nov 19 00:57:57 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 19 Nov 2012 00:57:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2Uu?=
Message-ID: <3Y4VVY5H4hzRLp@mail.python.org>

http://hg.python.org/cpython/rev/f9bb88e5fe2c
changeset:   80523:f9bb88e5fe2c
parent:      80522:129d8f50d045
parent:      80520:ceb0184c7f44
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 00:57:20 2012 +0100
summary:
  Merge.

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


diff --git a/Python/sysmodule.c b/Python/sysmodule.c
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1349,9 +1349,6 @@
     {"no_site",                 "-S"},
     {"ignore_environment",      "-E"},
     {"verbose",                 "-v"},
-#ifdef RISCOS
-    {"riscos_wimp",             "???"},
-#endif
     /* {"unbuffered",                   "-u"}, */
     /* {"skip_first",                   "-x"}, */
     {"bytes_warning",           "-b"},
@@ -1364,11 +1361,7 @@
     "sys.flags",        /* name */
     flags__doc__,       /* doc */
     flags_fields,       /* fields */
-#ifdef RISCOS
-    13
-#else
     12
-#endif
 };
 
 static PyObject*
@@ -1393,9 +1386,6 @@
     SetFlag(Py_NoSiteFlag);
     SetFlag(Py_IgnoreEnvironmentFlag);
     SetFlag(Py_VerboseFlag);
-#ifdef RISCOS
-    SetFlag(Py_RISCOSWimpFlag);
-#endif
     /* SetFlag(saw_unbuffered_flag); */
     /* SetFlag(skipfirstline); */
     SetFlag(Py_BytesWarningFlag);

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

From python-checkins at python.org  Mon Nov 19 01:00:15 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 19 Nov 2012 01:00:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_sys=2Eplatform_=3D?=
 =?utf-8?q?=3D_=27riscos=27_checks_from_some_Python_and_test_files=2E_=231?=
 =?utf-8?q?6501?=
Message-ID: <3Y4VYC1Mj7zR5l@mail.python.org>

http://hg.python.org/cpython/rev/6b74a93a2b8a
changeset:   80524:6b74a93a2b8a
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Nov 19 00:59:39 2012 +0100
summary:
  Remove sys.platform == 'riscos' checks from some Python and test files. #16501

files:
  Lib/site.py                    |  4 +---
  Lib/sysconfig.py               |  1 -
  Lib/test/test_select.py        |  2 +-
  Lib/test/test_signal.py        |  3 ---
  Lib/test/test_site.py          |  6 +-----
  Lib/test/test_threadsignals.py |  2 +-
  6 files changed, 4 insertions(+), 14 deletions(-)


diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -300,9 +300,7 @@
             continue
         seen.add(prefix)
 
-        if sys.platform == 'riscos':
-            sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-        elif os.sep == '/':
+        if os.sep == '/':
             sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
                                         "site-packages"))
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -191,7 +191,6 @@
     def joinuser(*args):
         return os.path.expanduser(os.path.join(*args))
 
-    # what about 'riscos' ?
     if os.name == "nt":
         base = os.environ.get("APPDATA") or "~"
         if env_base:
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -5,7 +5,7 @@
 import unittest
 from test import support
 
- at unittest.skipIf((sys.platform[:3]=='win') or (sys.platform=='riscos'),
+ at unittest.skipIf((sys.platform[:3]=='win'),
                  "can't easily test on this system")
 class SelectTestCase(unittest.TestCase):
 
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -15,9 +15,6 @@
 except ImportError:
     threading = None
 
-if sys.platform == 'riscos':
-    raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
-
 
 class HandlerBCalled(Exception):
     pass
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -222,11 +222,7 @@
         site.PREFIXES = ['xoxo']
         dirs = site.getsitepackages()
 
-        if sys.platform == 'riscos':
-            self.assertEqual(len(dirs), 1)
-            wanted = os.path.join('xoxo', 'Lib', 'site-packages')
-            self.assertEqual(dirs[0], wanted)
-        elif (sys.platform == "darwin" and
+        if (sys.platform == "darwin" and
             sysconfig.get_config_var("PYTHONFRAMEWORK")):
             # OS X framework builds
             site.PREFIXES = ['Python.framework']
diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
--- a/Lib/test/test_threadsignals.py
+++ b/Lib/test/test_threadsignals.py
@@ -8,7 +8,7 @@
 thread = import_module('_thread')
 import time
 
-if (sys.platform[:3] == 'win') or (sys.platform=='riscos'):
+if (sys.platform[:3] == 'win'):
     raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
 
 process_pid = os.getpid()

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

From python-checkins at python.org  Mon Nov 19 01:01:22 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 19 Nov 2012 01:01:22 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_9dd46?=
	=?utf-8?q?38de73b=2E?=
Message-ID: <3Y4VZV6w0CzR84@mail.python.org>

http://hg.python.org/cpython/rev/23ebb8936bf6
changeset:   80525:23ebb8936bf6
branch:      2.7
parent:      80514:4624570c1f19
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 01:00:45 2012 +0100
summary:
  Backport 9dd4638de73b.

files:
  Include/pyport.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -646,7 +646,7 @@
 /* On QNX 6, struct termio must be declared by including sys/termio.h
    if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must
    be included before termios.h or it will generate an error. */
-#ifdef HAVE_SYS_TERMIO_H
+#if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux)
 #include <sys/termio.h>
 #endif
 

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

From python-checkins at python.org  Mon Nov 19 03:50:06 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Mon, 19 Nov 2012 03:50:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_remove_unused_flag_=28clos?=
	=?utf-8?q?es_=2316505=29?=
Message-ID: <3Y4ZKB5R9MzQFC@mail.python.org>

http://hg.python.org/cpython/rev/cf606c403f14
changeset:   80526:cf606c403f14
parent:      80524:6b74a93a2b8a
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Nov 18 20:49:39 2012 -0600
summary:
  remove unused flag (closes #16505)

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


diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -632,7 +632,6 @@
 #define Py_TPFLAGS_IS_ABSTRACT (1UL << 20)
 
 /* These flags are used to determine if a type is a subclass. */
-#define Py_TPFLAGS_INT_SUBCLASS         (1UL << 23)
 #define Py_TPFLAGS_LONG_SUBCLASS        (1UL << 24)
 #define Py_TPFLAGS_LIST_SUBCLASS        (1UL << 25)
 #define Py_TPFLAGS_TUPLE_SUBCLASS       (1UL << 26)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16505: Remove unused Py_TPFLAGS_INT_SUBCLASS.
+
 - Issue #16306: Fix multiple error messages when unknown command line
   parameters where passed to the interpreter.  Patch by Hieu Nguyen.
 

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

From solipsis at pitrou.net  Mon Nov 19 05:55:55 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 19 Nov 2012 05:55:55 +0100
Subject: [Python-checkins] Daily reference leaks (6b74a93a2b8a): sum=0
Message-ID: <E1TaJOl-00006d-Fd@ap.vmr.nerim.net>

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



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

From python-checkins at python.org  Mon Nov 19 07:37:51 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 19 Nov 2012 07:37:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_a_brief_introduction?=
	=?utf-8?q?=2E?=
Message-ID: <3Y4gMz2smJzRSj@mail.python.org>

http://hg.python.org/devguide/rev/a710f4729234
changeset:   569:a710f4729234
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Nov 18 22:33:33 2012 -0800
summary:
  Add a brief introduction.

files:
  index.rst |  12 ++++++++++--
  1 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -33,11 +33,16 @@
    faq
 
 
+This guide is a comprehensive resource for :ref:`contributing <contributing>`
+to Python_ -- for both new and experienced contributors.  It is
+:ref:`maintained <helping-with-the-developers-guide>` by the same community
+that maintains Python.  We welcome your contributions to Python!
+
 Quick Start
 -----------
 
-Here is a list of the basic steps needed to get :ref:`set up <setup>` with
-`CPython <http://www.python.org/>`__ and make a patch:
+Here are the basic steps needed to get :ref:`set up <setup>` and contribute a
+patch:
 
 1. :ref:`Get the source code <checkout>`::
 
@@ -73,6 +78,8 @@
 * PEPs_ (Python Enhancement Proposals)
 
 
+.. _contributing:
+
 Contributing
 ------------
 
@@ -195,6 +202,7 @@
 .. _Misc directory: http://hg.python.org/cpython/file/default/Misc
 .. _PEPs: http://www.python.org/dev/peps
 .. _python.org maintenance: http://python.org/dev/pydotorg/
+.. _Python: http://www.python.org/
 .. _Python Mentors: http://pythonmentors.com/
 .. _PyPy: http://www.pypy.org/
 .. _Jython: http://www.jython.org/

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

From python-checkins at python.org  Mon Nov 19 07:39:33 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 19 Nov 2012 07:39:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Fix_typo_in_section_about?=
 =?utf-8?q?_helping_with_the_devguide=2E?=
Message-ID: <3Y4gPx6nWvzRSj@mail.python.org>

http://hg.python.org/devguide/rev/3df64babc096
changeset:   570:3df64babc096
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Nov 18 22:39:07 2012 -0800
summary:
  Fix typo in section about helping with the devguide.

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


diff --git a/docquality.rst b/docquality.rst
--- a/docquality.rst
+++ b/docquality.rst
@@ -73,7 +73,7 @@
 
 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
+repository`_.  Bug reports 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.

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

From python-checkins at python.org  Mon Nov 19 21:29:47 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 19 Nov 2012 21:29:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Unhide_and_move_table_of_?=
 =?utf-8?q?contents_to_bottom_of_home_page_=28issue_=2316506=29=2E?=
Message-ID: <3Y51qv4SzrzQQD@mail.python.org>

http://hg.python.org/devguide/rev/996b72dd1e31
changeset:   571:996b72dd1e31
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Mon Nov 19 12:26:35 2012 -0800
summary:
  Unhide and move table of contents to bottom of home page (issue #16506).

This commit also adjusts the nesting levels of a few pages so that pages
are in correspondence with the top level table of content items.

files:
  documenting.rst |   1 +
  index.rst       |  67 +++++++++++++++++++-----------------
  setup.rst       |  11 +++--
  tracker.rst     |   4 ++
  4 files changed, 46 insertions(+), 37 deletions(-)


diff --git a/documenting.rst b/documenting.rst
--- a/documenting.rst
+++ b/documenting.rst
@@ -1,5 +1,6 @@
 .. _documenting:
 
+==================
 Documenting Python
 ==================
 
diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -1,38 +1,7 @@
+========================
 Python Developer's Guide
 ========================
 
-.. toctree::
-   :hidden:
-
-   setup
-   help
-   patch
-   runtests
-   coverage
-   docquality
-   documenting
-   silencewarnings
-   fixingissues
-   tracker
-   triaging
-   communication
-   coredev
-   developers
-   committing
-   devcycle
-   buildbots
-
-   stdlibchanges
-   langchanges
-
-   experts
-   emacs
-   gdb
-   grammar
-   compiler
-   faq
-
-
 This guide is a comprehensive resource for :ref:`contributing <contributing>`
 to Python_ -- for both new and experienced contributors.  It is
 :ref:`maintained <helping-with-the-developers-guide>` by the same community
@@ -197,6 +166,40 @@
 
 * :ref:`Search this guide <search>`
 
+.. _contents:
+
+Full Table of Contents
+----------------------
+
+.. toctree::
+   :numbered:
+
+   setup
+   help
+   patch
+   runtests
+   coverage
+   docquality
+   documenting
+   silencewarnings
+   fixingissues
+   tracker
+   triaging
+   communication
+   coredev
+   developers
+   committing
+   devcycle
+   buildbots
+   stdlibchanges
+   langchanges
+   experts
+   emacs
+   gdb
+   grammar
+   compiler
+   faq
+
 .. _Buildbot status: http://python.org/dev/buildbot/
 .. _Firefox search engine plug-in: http://www.python.org/dev/searchplugin/
 .. _Misc directory: http://hg.python.org/cpython/file/default/Misc
diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -1,15 +1,16 @@
-.. _setup:
-
-Getting Set Up
-==============
+===============
+Getting Started
+===============
 
 These instructions cover how to get a working copy of the source code and a
 compiled version of the CPython interpreter (CPython is the version of Python
 available from http://www.python.org/). It also gives an overview of the
 directory structure of the CPython source code.
 
-.. contents::
+.. _setup:
 
+Getting Set Up
+==============
 
 Version Control Setup
 ---------------------
diff --git a/tracker.rst b/tracker.rst
--- a/tracker.rst
+++ b/tracker.rst
@@ -1,3 +1,7 @@
+==============
+Issue Tracking
+==============
+
 .. _tracker:
 
 Using the Issue Tracker

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

From python-checkins at python.org  Mon Nov 19 21:44:27 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 19 Nov 2012 21:44:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Make_spacing_between_sect?=
 =?utf-8?q?ions_consistent_on_home_page=2E?=
Message-ID: <3Y528q3ny6zQSd@mail.python.org>

http://hg.python.org/devguide/rev/b7533ef05fb0
changeset:   572:b7533ef05fb0
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Mon Nov 19 12:43:28 2012 -0800
summary:
  Make spacing between sections consistent on home page.

files:
  index.rst |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -7,6 +7,7 @@
 :ref:`maintained <helping-with-the-developers-guide>` by the same community
 that maintains Python.  We welcome your contributions to Python!
 
+
 Quick Start
 -----------
 
@@ -105,6 +106,7 @@
 
 Also refer to :ref:`suggesting-changes` in the FAQ.
 
+
 Other Interpreter Implementations
 ---------------------------------
 
@@ -150,6 +152,7 @@
 * :doc:`faq`
 * :doc:`developers`
 
+
 Additional Resources
 --------------------
 
@@ -166,6 +169,7 @@
 
 * :ref:`Search this guide <search>`
 
+
 .. _contents:
 
 Full Table of Contents
@@ -200,6 +204,7 @@
    compiler
    faq
 
+
 .. _Buildbot status: http://python.org/dev/buildbot/
 .. _Firefox search engine plug-in: http://www.python.org/dev/searchplugin/
 .. _Misc directory: http://hg.python.org/cpython/file/default/Misc
@@ -212,4 +217,3 @@
 .. _IronPython: http://ironpython.net/
 .. _Stackless: http://www.stackless.com/
 .. _Issue tracker: http://bugs.python.org/
-

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

From solipsis at pitrou.net  Tue Nov 20 05:55:46 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 20 Nov 2012 05:55:46 +0100
Subject: [Python-checkins] Daily reference leaks (cf606c403f14): sum=1
Message-ID: <E1TafsA-0008CE-4F@ap.vmr.nerim.net>

results for cf606c403f14 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/reflogO9DRhB', '-x']

From python-checkins at python.org  Tue Nov 20 14:35:22 2012
From: python-checkins at python.org (nick.coghlan)
Date: Tue, 20 Nov 2012 14:35:22 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Defer_PEP_395_until_I_make_it?=
	=?utf-8?q?_compatible_with_PEP_420?=
Message-ID: <3Y5SbG07jrzQSC@mail.python.org>

http://hg.python.org/peps/rev/0c41b06da22b
changeset:   4590:0c41b06da22b
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Tue Nov 20 23:35:12 2012 +1000
summary:
  Defer PEP 395 until I make it compatible with PEP 420

files:
  pep-0395.txt |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/pep-0395.txt b/pep-0395.txt
--- a/pep-0395.txt
+++ b/pep-0395.txt
@@ -3,11 +3,11 @@
 Version: $Revision$
 Last-Modified: $Date$
 Author: Nick Coghlan <ncoghlan at gmail.com>
-Status: Draft
+Status: Deferred
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 4-Mar-2011
-Python-Version: 3.3
+Python-Version: 3.4
 Post-History: 5-Mar-2011, 19-Nov-2011
 
 
@@ -24,6 +24,11 @@
 Relationship with Other PEPs
 ----------------------------
 
+Most significantly, this PEP is currently deferred as it requires
+significant changes in order to be made compatible with the removal
+of mandatory __init__.py files in PEP 420 (which has been implemented
+and released in Python 3.3).
+
 This PEP builds on the "qualified name" concept introduced by PEP 3155, and
 also shares in that PEP's aim of fixing some ugly corner cases when dealing
 with serialisation of arbitrary functions and classes.
@@ -32,11 +37,6 @@
 explicit relative imports from the main module work correctly in at least
 *some* circumstances.
 
-This PEP is also affected by the two competing "namespace package" PEPs
-(PEP 382 and PEP 402). This PEP would require some minor adjustments to
-accommodate PEP 382, but has some critical incompatibilities with respect to
-the implicit namespace package mechanism proposed in PEP 402.
-
 Finally, PEP 328 eliminated implicit relative imports from imported modules.
 This PEP proposes that the de facto implicit relative imports from main
 modules that are provided by the current initialisation behaviour for

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

From python-checkins at python.org  Tue Nov 20 15:14:02 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Tue, 20 Nov 2012 15:14:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_typo_in_mu?=
 =?utf-8?q?ltiprocessing_documentation=2C_thanks_to_Dmitry_Tolstoy_from_do?=
 =?utf-8?b?Y3NA?=
Message-ID: <3Y5TRt41dwzMt4@mail.python.org>

http://hg.python.org/cpython/rev/4537dd27b2dc
changeset:   80527:4537dd27b2dc
branch:      3.3
parent:      80521:90283c6f94fc
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Tue Nov 20 16:12:38 2012 +0200
summary:
  Fix typo in multiprocessing documentation, thanks to Dmitry Tolstoy from docs@

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
@@ -279,7 +279,7 @@
        return x*x
 
    if __name__ == '__main__':
-       with Pool(processes=4) as pool         # start 4 worker processes
+       with Pool(processes=4) as pool:        # start 4 worker processes
            result = pool.apply_async(f, [10]) # evaluate "f(10)" asynchronously
            print(result.get(timeout=1))       # prints "100" unless your computer is *very* slow
            print(pool.map(f, range(10)))      # prints "[0, 1, 4,..., 81]"

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

From python-checkins at python.org  Tue Nov 20 15:14:03 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Tue, 20 Nov 2012 15:14:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_fix_typo_in_multiprocessing_documentation=2C_th?=
 =?utf-8?q?anks_to_Dmitry_Tolstoy_from?=
Message-ID: <3Y5TRv6JCXzQ3L@mail.python.org>

http://hg.python.org/cpython/rev/d3cb8720f17e
changeset:   80528:d3cb8720f17e
parent:      80526:cf606c403f14
parent:      80527:4537dd27b2dc
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Tue Nov 20 16:13:54 2012 +0200
summary:
  Merge: fix typo in multiprocessing documentation, thanks to Dmitry Tolstoy from docs@

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
@@ -279,7 +279,7 @@
        return x*x
 
    if __name__ == '__main__':
-       with Pool(processes=4) as pool         # start 4 worker processes
+       with Pool(processes=4) as pool:        # start 4 worker processes
            result = pool.apply_async(f, [10]) # evaluate "f(10)" asynchronously
            print(result.get(timeout=1))       # prints "100" unless your computer is *very* slow
            print(pool.map(f, range(10)))      # prints "[0, 1, 4,..., 81]"

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

From python-checkins at python.org  Tue Nov 20 21:35:38 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 21:35:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogLSBJc3N1ZSAjMTY1?=
 =?utf-8?q?14=3A_Fix_regression_causing_a_traceback_when_sys=2Epath=5B0=5D?=
 =?utf-8?q?_is_None?=
Message-ID: <3Y5dwB3ZCMzMlG@mail.python.org>

http://hg.python.org/cpython/rev/291406748217
changeset:   80529:291406748217
branch:      3.3
parent:      80527:4537dd27b2dc
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 15:22:51 2012 -0500
summary:
  - Issue #16514: Fix regression causing a traceback when sys.path[0] is None
  (actually, any non-string or non-bytes type).

files:
  Doc/library/sys.rst                          |    4 +-
  Doc/reference/import.rst                     |   24 +-
  Lib/importlib/_bootstrap.py                  |    2 +
  Lib/test/test_importlib/import_/test_path.py |   25 +-
  Misc/NEWS                                    |    3 +
  Python/importlib.h                           |  130 +++++----
  6 files changed, 111 insertions(+), 77 deletions(-)


diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -783,7 +783,9 @@
    current directory first.  Notice that the script directory is inserted *before*
    the entries inserted as a result of :envvar:`PYTHONPATH`.
 
-   A program is free to modify this list for its own purposes.
+   A program is free to modify this list for its own purposes.  Only strings
+   and bytes should be added to :data:`sys.path`; all other data types are
+   ignored during import.
 
 
    .. seealso::
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -540,7 +540,10 @@
 implementation-specific defaults.  Entries in :data:`sys.path` can name
 directories on the file system, zip files, and potentially other "locations"
 (see the :mod:`site` module) that should be searched for modules, such as
-URLs, or database queries.
+URLs, or database queries.  Only strings and bytes should be present on
+:data:`sys.path`; all other data types are ignored.  The encoding of bytes
+entries is determined by the individual :term:`path entry finders <path entry
+finder>`.
 
 The :term:`path based finder` is a :term:`meta path finder`, so the import
 machinery begins the :term:`import path` search by calling the path
@@ -563,14 +566,17 @@
 the path based finder to perform the path entry search again [#fnpic]_.
 
 If the path entry is not present in the cache, the path based finder iterates
-over every callable in :data:`sys.path_hooks`.  Each of the
-:term:`path entry hooks <path entry hook>` in this list is called with a
-single argument, the path entry to be searched.  This callable may either
-return a :term:`path entry finder` that can handle the path entry, or it may
-raise :exc:`ImportError`.
-An :exc:`ImportError` is used by the path based finder to signal that the hook
-cannot find a :term:`path entry finder` for that :term:`path entry`.  The
-exception is ignored and :term:`import path` iteration continues.
+over every callable in :data:`sys.path_hooks`.  Each of the :term:`path entry
+hooks <path entry hook>` in this list is called with a single argument, the
+path entry to be searched.  This callable may either return a :term:`path
+entry finder` that can handle the path entry, or it may raise
+:exc:`ImportError`.  An :exc:`ImportError` is used by the path based finder to
+signal that the hook cannot find a :term:`path entry finder` for that
+:term:`path entry`.  The exception is ignored and :term:`import path`
+iteration continues.  The hook should expect either a string or bytes object;
+the encoding of bytes objects is up to the hook (e.g. it may be a file system
+encoding, UTF-8, or something else), and if the hook cannot decode the
+argument, it should raise :exc:`ImportError`.
 
 If :data:`sys.path_hooks` iteration ends with no :term:`path entry finder`
 being returned, then the path based finder's :meth:`find_module()` method
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1281,6 +1281,8 @@
         #  the list of paths that will become its __path__
         namespace_path = []
         for entry in path:
+            if not isinstance(entry, (str, bytes)):
+                continue
             finder = cls._path_importer_cache(entry)
             if finder is not None:
                 if hasattr(finder, 'find_loader'):
diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -1,15 +1,14 @@
 from importlib import _bootstrap
 from importlib import machinery
+from importlib import import_module
 from .. import util
 from . import util as import_util
-import imp
 import os
 import sys
-import tempfile
-from test import support
-from types import MethodType
+from types import ModuleType
 import unittest
 import warnings
+import zipimport
 
 
 class FinderTests(unittest.TestCase):
@@ -89,6 +88,24 @@
             self.assertIs(loader, importer)
             self.assertIn(os.curdir, sys.path_importer_cache)
 
+    def test_None_on_sys_path(self):
+        # Putting None in sys.path[0] caused an import regression from Python
+        # 3.2: http://bugs.python.org/issue16514
+        new_path = sys.path[:]
+        new_path.insert(0, None)
+        new_path_importer_cache = sys.path_importer_cache.copy()
+        new_path_importer_cache.pop(None, None)
+        new_path_hooks = [zipimport.zipimporter,
+                          _bootstrap.FileFinder.path_hook(
+                              *_bootstrap._get_supported_file_loaders())]
+        with util.uncache('email'):
+            with util.import_state(meta_path=sys.meta_path[:],
+                                   path=new_path,
+                                   path_importer_cache=new_path_importer_cache,
+                                   path_hooks=new_path_hooks):
+                module = import_module('email')
+                self.assertIsInstance(module, ModuleType)
+
 
 def test_main():
     from test.support import run_unittest
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16514: Fix regression causing a traceback when sys.path[0] is None
+  (actually, any non-string or non-bytes type).
+
 - Issue #16306: Fix multiple error messages when unknown command line
   parameters where passed to the interpreter.  Patch by Hieu Nguyen.
 
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 Nov 20 21:35:40 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 21:35:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_-_Issue_=2316514=3A_Fix_regression_causing_a_traceback_w?=
 =?utf-8?q?hen_sys=2Epath=5B0=5D_is_None?=
Message-ID: <3Y5dwD09LyzPjS@mail.python.org>

http://hg.python.org/cpython/rev/a82ee9a1457a
changeset:   80530:a82ee9a1457a
parent:      80528:d3cb8720f17e
parent:      80529:291406748217
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 15:35:27 2012 -0500
summary:
  - Issue #16514: Fix regression causing a traceback when sys.path[0] is None
  (actually, any non-string or non-bytes type).

files:
  Doc/library/sys.rst                          |    4 +-
  Doc/reference/import.rst                     |   24 +-
  Lib/importlib/_bootstrap.py                  |    2 +
  Lib/test/test_importlib/import_/test_path.py |   25 +-
  Misc/NEWS                                    |    3 +
  Python/importlib.h                           |  130 +++++----
  6 files changed, 111 insertions(+), 77 deletions(-)


diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -783,7 +783,9 @@
    current directory first.  Notice that the script directory is inserted *before*
    the entries inserted as a result of :envvar:`PYTHONPATH`.
 
-   A program is free to modify this list for its own purposes.
+   A program is free to modify this list for its own purposes.  Only strings
+   and bytes should be added to :data:`sys.path`; all other data types are
+   ignored during import.
 
 
    .. seealso::
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -540,7 +540,10 @@
 implementation-specific defaults.  Entries in :data:`sys.path` can name
 directories on the file system, zip files, and potentially other "locations"
 (see the :mod:`site` module) that should be searched for modules, such as
-URLs, or database queries.
+URLs, or database queries.  Only strings and bytes should be present on
+:data:`sys.path`; all other data types are ignored.  The encoding of bytes
+entries is determined by the individual :term:`path entry finders <path entry
+finder>`.
 
 The :term:`path based finder` is a :term:`meta path finder`, so the import
 machinery begins the :term:`import path` search by calling the path
@@ -563,14 +566,17 @@
 the path based finder to perform the path entry search again [#fnpic]_.
 
 If the path entry is not present in the cache, the path based finder iterates
-over every callable in :data:`sys.path_hooks`.  Each of the
-:term:`path entry hooks <path entry hook>` in this list is called with a
-single argument, the path entry to be searched.  This callable may either
-return a :term:`path entry finder` that can handle the path entry, or it may
-raise :exc:`ImportError`.
-An :exc:`ImportError` is used by the path based finder to signal that the hook
-cannot find a :term:`path entry finder` for that :term:`path entry`.  The
-exception is ignored and :term:`import path` iteration continues.
+over every callable in :data:`sys.path_hooks`.  Each of the :term:`path entry
+hooks <path entry hook>` in this list is called with a single argument, the
+path entry to be searched.  This callable may either return a :term:`path
+entry finder` that can handle the path entry, or it may raise
+:exc:`ImportError`.  An :exc:`ImportError` is used by the path based finder to
+signal that the hook cannot find a :term:`path entry finder` for that
+:term:`path entry`.  The exception is ignored and :term:`import path`
+iteration continues.  The hook should expect either a string or bytes object;
+the encoding of bytes objects is up to the hook (e.g. it may be a file system
+encoding, UTF-8, or something else), and if the hook cannot decode the
+argument, it should raise :exc:`ImportError`.
 
 If :data:`sys.path_hooks` iteration ends with no :term:`path entry finder`
 being returned, then the path based finder's :meth:`find_module()` method
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1287,6 +1287,8 @@
         #  the list of paths that will become its __path__
         namespace_path = []
         for entry in path:
+            if not isinstance(entry, (str, bytes)):
+                continue
             finder = cls._path_importer_cache(entry)
             if finder is not None:
                 if hasattr(finder, 'find_loader'):
diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -1,15 +1,14 @@
 from importlib import _bootstrap
 from importlib import machinery
+from importlib import import_module
 from .. import util
 from . import util as import_util
-import imp
 import os
 import sys
-import tempfile
-from test import support
-from types import MethodType
+from types import ModuleType
 import unittest
 import warnings
+import zipimport
 
 
 class FinderTests(unittest.TestCase):
@@ -89,6 +88,24 @@
             self.assertIs(loader, importer)
             self.assertIn(os.curdir, sys.path_importer_cache)
 
+    def test_None_on_sys_path(self):
+        # Putting None in sys.path[0] caused an import regression from Python
+        # 3.2: http://bugs.python.org/issue16514
+        new_path = sys.path[:]
+        new_path.insert(0, None)
+        new_path_importer_cache = sys.path_importer_cache.copy()
+        new_path_importer_cache.pop(None, None)
+        new_path_hooks = [zipimport.zipimporter,
+                          _bootstrap.FileFinder.path_hook(
+                              *_bootstrap._get_supported_file_loaders())]
+        with util.uncache('email'):
+            with util.import_state(meta_path=sys.meta_path[:],
+                                   path=new_path,
+                                   path_importer_cache=new_path_importer_cache,
+                                   path_hooks=new_path_hooks):
+                module = import_module('email')
+                self.assertIsInstance(module, ModuleType)
+
 
 def test_main():
     from test.support import run_unittest
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16514: Fix regression causing a traceback when sys.path[0] is None
+  (actually, any non-string or non-bytes type).
+
 - Issue #16505: Remove unused Py_TPFLAGS_INT_SUBCLASS.
 
 - Issue #16306: Fix multiple error messages when unknown command line
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 Nov 20 22:31:46 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Tue, 20 Nov 2012 22:31:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzExNjA6?=
 =?utf-8?q?_Fix_compiling_large_regular_expressions_on_UCS2_builds=2E?=
Message-ID: <3Y5g8y2Fh9zPyF@mail.python.org>

http://hg.python.org/cpython/rev/10314c9b7c5a
changeset:   80531:10314c9b7c5a
branch:      2.7
parent:      80525:23ebb8936bf6
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Nov 20 22:30:42 2012 +0100
summary:
  Issue #1160: Fix compiling large regular expressions on UCS2 builds.
Patch by Serhiy Storchaka.

files:
  Lib/test/test_re.py |   6 ++++++
  Misc/NEWS           |   3 +++
  Modules/_sre.c      |  11 +++++++----
  Modules/sre.h       |   6 +-----
  4 files changed, 17 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -425,6 +425,12 @@
         self.assertEqual(re.match(u"([\u2222\u2223])",
                                   u"\u2222", re.UNICODE).group(1), u"\u2222")
 
+    def test_big_codesize(self):
+        # Issue #1160
+        r = re.compile('|'.join(('%d'%x for x in range(10000))))
+        self.assertIsNotNone(r.match('1000'))
+        self.assertIsNotNone(r.match('9999'))
+
     def test_anyall(self):
         self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0),
                          "a\nb")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -151,6 +151,9 @@
 Library
 -------
 
+- Issue #1160: Fix compiling large regular expressions on UCS2 builds.
+  Patch by Serhiy Storchaka.
+
 - Issue #14313: zipfile now raises NotImplementedError when the compression
   type is unknown.
 
diff --git a/Modules/_sre.c b/Modules/_sre.c
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -2675,6 +2675,13 @@
         PyObject *o = PyList_GET_ITEM(code, i);
         unsigned long value = PyInt_Check(o) ? (unsigned long)PyInt_AsLong(o)
                                               : PyLong_AsUnsignedLong(o);
+        if (value == (unsigned long)-1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "regular expression code size limit exceeded");
+            }
+            break;
+        }
         self->code[i] = (SRE_CODE) value;
         if ((unsigned long) self->code[i] != value) {
             PyErr_SetString(PyExc_OverflowError,
@@ -3035,10 +3042,8 @@
                 GET_ARG; max = arg;
                 if (min > max)
                     FAIL;
-#ifdef Py_UNICODE_WIDE
                 if (max > 65535)
                     FAIL;
-#endif
                 if (!_validate_inner(code, code+skip-4, groups))
                     FAIL;
                 code += skip-4;
@@ -3056,10 +3061,8 @@
                 GET_ARG; max = arg;
                 if (min > max)
                     FAIL;
-#ifdef Py_UNICODE_WIDE
                 if (max > 65535)
                     FAIL;
-#endif
                 if (!_validate_inner(code, code+skip-3, groups))
                     FAIL;
                 code += skip-3;
diff --git a/Modules/sre.h b/Modules/sre.h
--- a/Modules/sre.h
+++ b/Modules/sre.h
@@ -14,12 +14,8 @@
 #include "sre_constants.h"
 
 /* size of a code word (must be unsigned short or larger, and
-   large enough to hold a Py_UNICODE character) */
-#ifdef Py_UNICODE_WIDE
+   large enough to hold a UCS4 character) */
 #define SRE_CODE Py_UCS4
-#else
-#define SRE_CODE unsigned short
-#endif
 
 typedef struct {
     PyObject_VAR_HEAD

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

From python-checkins at python.org  Tue Nov 20 22:38:11 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Tue, 20 Nov 2012 22:38:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzExNjA6?=
 =?utf-8?q?_Fix_compiling_large_regular_expressions_on_UCS2_builds=2E?=
Message-ID: <3Y5gJM48mXzQ4T@mail.python.org>

http://hg.python.org/cpython/rev/a3579d766fb6
changeset:   80532:a3579d766fb6
branch:      3.2
parent:      80515:d2054aa9bed4
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Nov 20 22:30:42 2012 +0100
summary:
  Issue #1160: Fix compiling large regular expressions on UCS2 builds.
Patch by Serhiy Storchaka.

files:
  Lib/test/test_re.py |   6 ++++++
  Misc/NEWS           |   3 +++
  Modules/_sre.c      |  11 +++++++----
  Modules/sre.h       |   6 +-----
  4 files changed, 17 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -419,6 +419,12 @@
         self.assertEqual(re.match("([\u2222\u2223])",
                                   "\u2222", re.UNICODE).group(1), "\u2222")
 
+    def test_big_codesize(self):
+        # Issue #1160
+        r = re.compile('|'.join(('%d'%x for x in range(10000))))
+        self.assertIsNotNone(r.match('1000'))
+        self.assertIsNotNone(r.match('9999'))
+
     def test_anyall(self):
         self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0),
                          "a\nb")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,9 @@
 Library
 -------
 
+- Issue #1160: Fix compiling large regular expressions on UCS2 builds.
+  Patch by Serhiy Storchaka.
+
 - Issue #14313: zipfile now raises NotImplementedError when the compression
   type is unknown.
 
diff --git a/Modules/_sre.c b/Modules/_sre.c
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -2695,6 +2695,13 @@
     for (i = 0; i < n; i++) {
         PyObject *o = PyList_GET_ITEM(code, i);
         unsigned long value = PyLong_AsUnsignedLong(o);
+        if (value == (unsigned long)-1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "regular expression code size limit exceeded");
+            }
+            break;
+        }
         self->code[i] = (SRE_CODE) value;
         if ((unsigned long) self->code[i] != value) {
             PyErr_SetString(PyExc_OverflowError,
@@ -3065,10 +3072,8 @@
                 GET_ARG; max = arg;
                 if (min > max)
                     FAIL;
-#ifdef Py_UNICODE_WIDE
                 if (max > 65535)
                     FAIL;
-#endif
                 if (!_validate_inner(code, code+skip-4, groups))
                     FAIL;
                 code += skip-4;
@@ -3086,10 +3091,8 @@
                 GET_ARG; max = arg;
                 if (min > max)
                     FAIL;
-#ifdef Py_UNICODE_WIDE
                 if (max > 65535)
                     FAIL;
-#endif
                 if (!_validate_inner(code, code+skip-3, groups))
                     FAIL;
                 code += skip-3;
diff --git a/Modules/sre.h b/Modules/sre.h
--- a/Modules/sre.h
+++ b/Modules/sre.h
@@ -14,12 +14,8 @@
 #include "sre_constants.h"
 
 /* size of a code word (must be unsigned short or larger, and
-   large enough to hold a Py_UNICODE character) */
-#ifdef Py_UNICODE_WIDE
+   large enough to hold a UCS4 character) */
 #define SRE_CODE Py_UCS4
-#else
-#define SRE_CODE unsigned short
-#endif
 
 typedef struct {
     PyObject_VAR_HEAD

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

From python-checkins at python.org  Tue Nov 20 22:38:12 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Tue, 20 Nov 2012 22:38:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_test_from_issue_=231160=2E?=
Message-ID: <3Y5gJN6VJmzQ4T@mail.python.org>

http://hg.python.org/cpython/rev/8b73a069ae4f
changeset:   80533:8b73a069ae4f
branch:      3.3
parent:      80529:291406748217
parent:      80532:a3579d766fb6
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Nov 20 22:35:53 2012 +0100
summary:
  Merge test from issue #1160.

files:
  Lib/test/test_re.py |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -419,6 +419,12 @@
         self.assertEqual(re.match("([\u2222\u2223])",
                                   "\u2222", re.UNICODE).group(1), "\u2222")
 
+    def test_big_codesize(self):
+        # Issue #1160
+        r = re.compile('|'.join(('%d'%x for x in range(10000))))
+        self.assertIsNotNone(r.match('1000'))
+        self.assertIsNotNone(r.match('9999'))
+
     def test_anyall(self):
         self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0),
                          "a\nb")

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

From python-checkins at python.org  Tue Nov 20 22:38:14 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Tue, 20 Nov 2012 22:38:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_test_from_issue_=231160=2E?=
Message-ID: <3Y5gJQ1wJgzQ3C@mail.python.org>

http://hg.python.org/cpython/rev/10c1f9e05f4f
changeset:   80534:10c1f9e05f4f
parent:      80530:a82ee9a1457a
parent:      80533:8b73a069ae4f
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Nov 20 22:37:04 2012 +0100
summary:
  Merge test from issue #1160.

files:
  Lib/test/test_re.py |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -419,6 +419,12 @@
         self.assertEqual(re.match("([\u2222\u2223])",
                                   "\u2222", re.UNICODE).group(1), "\u2222")
 
+    def test_big_codesize(self):
+        # Issue #1160
+        r = re.compile('|'.join(('%d'%x for x in range(10000))))
+        self.assertIsNotNone(r.match('1000'))
+        self.assertIsNotNone(r.match('9999'))
+
     def test_anyall(self):
         self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0),
                          "a\nb")

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

From python-checkins at python.org  Tue Nov 20 23:12:12 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 23:12:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Do_a_better_jo?=
 =?utf-8?q?b_of_ensuring_test_reproducibility_and_clean_up=2E?=
Message-ID: <3Y5h3c2z5RzQ1f@mail.python.org>

http://hg.python.org/cpython/rev/fc6d7868a192
changeset:   80535:fc6d7868a192
branch:      3.3
parent:      80529:291406748217
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 17:05:41 2012 -0500
summary:
  Do a better job of ensuring test reproducibility and clean up.

files:
  Lib/test/test_importlib/import_/test_path.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -98,13 +98,18 @@
         new_path_hooks = [zipimport.zipimporter,
                           _bootstrap.FileFinder.path_hook(
                               *_bootstrap._get_supported_file_loaders())]
-        with util.uncache('email'):
+        missing = object()
+        email = sys.modules.pop('email', missing)
+        try:
             with util.import_state(meta_path=sys.meta_path[:],
                                    path=new_path,
                                    path_importer_cache=new_path_importer_cache,
                                    path_hooks=new_path_hooks):
                 module = import_module('email')
                 self.assertIsInstance(module, ModuleType)
+        finally:
+            if email is not missing:
+                sys.modules['email'] = email
 
 
 def test_main():

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

From python-checkins at python.org  Tue Nov 20 23:12:13 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 23:12:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Do_a_better_jo?=
 =?utf-8?q?b_of_preserving_the_state_of_sys=2Emodules=2E?=
Message-ID: <3Y5h3d5DQtzQ3C@mail.python.org>

http://hg.python.org/cpython/rev/4c5854ef7276
changeset:   80536:4c5854ef7276
branch:      3.3
parent:      80533:8b73a069ae4f
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 17:10:10 2012 -0500
summary:
  Do a better job of preserving the state of sys.modules.

files:
  Lib/test/test_importlib/import_/test_path.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -98,13 +98,18 @@
         new_path_hooks = [zipimport.zipimporter,
                           _bootstrap.FileFinder.path_hook(
                               *_bootstrap._get_supported_file_loaders())]
-        with util.uncache('email'):
+        missing = object()
+        email = sys.modules.pop('email', missing)
+        try:
             with util.import_state(meta_path=sys.meta_path[:],
                                    path=new_path,
                                    path_importer_cache=new_path_importer_cache,
                                    path_hooks=new_path_hooks):
                 module = import_module('email')
                 self.assertIsInstance(module, ModuleType)
+        finally:
+            if email is not missing:
+                sys.modules['email'] = email
 
 
 def test_main():

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

From python-checkins at python.org  Tue Nov 20 23:12:15 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 23:12:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Do_a_better_job_of_preserving_the_state_of_sys=2Emodules?=
 =?utf-8?q?=2E?=
Message-ID: <3Y5h3g0KS1zQB7@mail.python.org>

http://hg.python.org/cpython/rev/879c7b659fca
changeset:   80537:879c7b659fca
parent:      80534:10c1f9e05f4f
parent:      80536:4c5854ef7276
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 17:10:39 2012 -0500
summary:
  Do a better job of preserving the state of sys.modules.

files:
  Lib/test/test_importlib/import_/test_path.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -98,13 +98,18 @@
         new_path_hooks = [zipimport.zipimporter,
                           _bootstrap.FileFinder.path_hook(
                               *_bootstrap._get_supported_file_loaders())]
-        with util.uncache('email'):
+        missing = object()
+        email = sys.modules.pop('email', missing)
+        try:
             with util.import_state(meta_path=sys.meta_path[:],
                                    path=new_path,
                                    path_importer_cache=new_path_importer_cache,
                                    path_hooks=new_path_hooks):
                 module = import_module('email')
                 self.assertIsInstance(module, ModuleType)
+        finally:
+            if email is not missing:
+                sys.modules['email'] = email
 
 
 def test_main():

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

From python-checkins at python.org  Tue Nov 20 23:12:16 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 23:12:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_null_merge?=
Message-ID: <3Y5h3h2RJxzQDD@mail.python.org>

http://hg.python.org/cpython/rev/7bf09b2037f0
changeset:   80538:7bf09b2037f0
branch:      3.3
parent:      80536:4c5854ef7276
parent:      80535:fc6d7868a192
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 17:11:46 2012 -0500
summary:
  null merge

files:



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

From python-checkins at python.org  Tue Nov 20 23:12:17 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 20 Nov 2012 23:12:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_null_merge?=
Message-ID: <3Y5h3j4QnfzQ0R@mail.python.org>

http://hg.python.org/cpython/rev/ead853fe9836
changeset:   80539:ead853fe9836
parent:      80537:879c7b659fca
parent:      80538:7bf09b2037f0
user:        Barry Warsaw <barry at python.org>
date:        Tue Nov 20 17:12:06 2012 -0500
summary:
  null merge

files:



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

From brett at python.org  Tue Nov 20 23:12:28 2012
From: brett at python.org (Brett Cannon)
Date: Tue, 20 Nov 2012 17:12:28 -0500
Subject: [Python-checkins] cpython (3.3): - Issue #16514: Fix regression
 causing a traceback when sys.path[0] is None
In-Reply-To: <3Y5dwB3ZCMzMlG@mail.python.org>
References: <3Y5dwB3ZCMzMlG@mail.python.org>
Message-ID: <CAP1=2W4KTyoDYW6jO_1oQd+rYDE_cboKgsOk=05R5FzjPxEyqQ@mail.gmail.com>

Should you also insert None into sys.path_importer_cache to signify there
is no finder for the path entry? I guess the real problem with that is
there is no guarantee the path entry is hashable, so that probably won't
work. So nevermind. =)


On Tue, Nov 20, 2012 at 3:35 PM, barry.warsaw <python-checkins at python.org>wrote:

> http://hg.python.org/cpython/rev/291406748217
> changeset:   80529:291406748217
> branch:      3.3
> parent:      80527:4537dd27b2dc
> user:        Barry Warsaw <barry at python.org>
> date:        Tue Nov 20 15:22:51 2012 -0500
> summary:
>   - Issue #16514: Fix regression causing a traceback when sys.path[0] is
> None
>   (actually, any non-string or non-bytes type).
>
> files:
>   Doc/library/sys.rst                          |    4 +-
>   Doc/reference/import.rst                     |   24 +-
>   Lib/importlib/_bootstrap.py                  |    2 +
>   Lib/test/test_importlib/import_/test_path.py |   25 +-
>   Misc/NEWS                                    |    3 +
>   Python/importlib.h                           |  130 +++++----
>   6 files changed, 111 insertions(+), 77 deletions(-)
>
>
> diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
> --- a/Doc/library/sys.rst
> +++ b/Doc/library/sys.rst
> @@ -783,7 +783,9 @@
>     current directory first.  Notice that the script directory is inserted
> *before*
>     the entries inserted as a result of :envvar:`PYTHONPATH`.
>
> -   A program is free to modify this list for its own purposes.
> +   A program is free to modify this list for its own purposes.  Only
> strings
> +   and bytes should be added to :data:`sys.path`; all other data types are
> +   ignored during import.
>
>
>     .. seealso::
> diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
> --- a/Doc/reference/import.rst
> +++ b/Doc/reference/import.rst
> @@ -540,7 +540,10 @@
>  implementation-specific defaults.  Entries in :data:`sys.path` can name
>  directories on the file system, zip files, and potentially other
> "locations"
>  (see the :mod:`site` module) that should be searched for modules, such as
> -URLs, or database queries.
> +URLs, or database queries.  Only strings and bytes should be present on
> +:data:`sys.path`; all other data types are ignored.  The encoding of bytes
> +entries is determined by the individual :term:`path entry finders <path
> entry
> +finder>`.
>
>  The :term:`path based finder` is a :term:`meta path finder`, so the import
>  machinery begins the :term:`import path` search by calling the path
> @@ -563,14 +566,17 @@
>  the path based finder to perform the path entry search again [#fnpic]_.
>
>  If the path entry is not present in the cache, the path based finder
> iterates
> -over every callable in :data:`sys.path_hooks`.  Each of the
> -:term:`path entry hooks <path entry hook>` in this list is called with a
> -single argument, the path entry to be searched.  This callable may either
> -return a :term:`path entry finder` that can handle the path entry, or it
> may
> -raise :exc:`ImportError`.
> -An :exc:`ImportError` is used by the path based finder to signal that the
> hook
> -cannot find a :term:`path entry finder` for that :term:`path entry`.  The
> -exception is ignored and :term:`import path` iteration continues.
> +over every callable in :data:`sys.path_hooks`.  Each of the :term:`path
> entry
> +hooks <path entry hook>` in this list is called with a single argument,
> the
> +path entry to be searched.  This callable may either return a :term:`path
> +entry finder` that can handle the path entry, or it may raise
> +:exc:`ImportError`.  An :exc:`ImportError` is used by the path based
> finder to
> +signal that the hook cannot find a :term:`path entry finder` for that
> +:term:`path entry`.  The exception is ignored and :term:`import path`
> +iteration continues.  The hook should expect either a string or bytes
> object;
> +the encoding of bytes objects is up to the hook (e.g. it may be a file
> system
> +encoding, UTF-8, or something else), and if the hook cannot decode the
> +argument, it should raise :exc:`ImportError`.
>
>  If :data:`sys.path_hooks` iteration ends with no :term:`path entry finder`
>  being returned, then the path based finder's :meth:`find_module()` method
> diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
> --- a/Lib/importlib/_bootstrap.py
> +++ b/Lib/importlib/_bootstrap.py
> @@ -1281,6 +1281,8 @@
>          #  the list of paths that will become its __path__
>          namespace_path = []
>          for entry in path:
> +            if not isinstance(entry, (str, bytes)):
> +                continue
>              finder = cls._path_importer_cache(entry)
>              if finder is not None:
>                  if hasattr(finder, 'find_loader'):
> diff --git a/Lib/test/test_importlib/import_/test_path.py
> b/Lib/test/test_importlib/import_/test_path.py
> --- a/Lib/test/test_importlib/import_/test_path.py
> +++ b/Lib/test/test_importlib/import_/test_path.py
> @@ -1,15 +1,14 @@
>  from importlib import _bootstrap
>  from importlib import machinery
> +from importlib import import_module
>  from .. import util
>  from . import util as import_util
> -import imp
>  import os
>  import sys
> -import tempfile
> -from test import support
> -from types import MethodType
> +from types import ModuleType
>  import unittest
>  import warnings
> +import zipimport
>
>
>  class FinderTests(unittest.TestCase):
> @@ -89,6 +88,24 @@
>              self.assertIs(loader, importer)
>              self.assertIn(os.curdir, sys.path_importer_cache)
>
> +    def test_None_on_sys_path(self):
> +        # Putting None in sys.path[0] caused an import regression from
> Python
> +        # 3.2: http://bugs.python.org/issue16514
> +        new_path = sys.path[:]
> +        new_path.insert(0, None)
> +        new_path_importer_cache = sys.path_importer_cache.copy()
> +        new_path_importer_cache.pop(None, None)
> +        new_path_hooks = [zipimport.zipimporter,
> +                          _bootstrap.FileFinder.path_hook(
> +                              *_bootstrap._get_supported_file_loaders())]
> +        with util.uncache('email'):
> +            with util.import_state(meta_path=sys.meta_path[:],
> +                                   path=new_path,
> +
> path_importer_cache=new_path_importer_cache,
> +                                   path_hooks=new_path_hooks):
> +                module = import_module('email')
> +                self.assertIsInstance(module, ModuleType)
> +
>
>  def test_main():
>      from test.support import run_unittest
> diff --git a/Misc/NEWS b/Misc/NEWS
> --- a/Misc/NEWS
> +++ b/Misc/NEWS
> @@ -12,6 +12,9 @@
>  Core and Builtins
>  -----------------
>
> +- Issue #16514: Fix regression causing a traceback when sys.path[0] is
> None
> +  (actually, any non-string or non-bytes type).
> +
>  - Issue #16306: Fix multiple error messages when unknown command line
>    parameters where passed to the interpreter.  Patch by Hieu Nguyen.
>
> 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
>
> _______________________________________________
> 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/20121120/0c7139ce/attachment-0001.html>

From tjreedy at udel.edu  Tue Nov 20 23:35:41 2012
From: tjreedy at udel.edu (Terry Reedy)
Date: Tue, 20 Nov 2012 17:35:41 -0500
Subject: [Python-checkins] cpython (3.3): - Issue #16514: Fix regression
 causing a traceback when sys.path[0] is None
In-Reply-To: <3Y5dwB3ZCMzMlG@mail.python.org>
References: <3Y5dwB3ZCMzMlG@mail.python.org>
Message-ID: <50AC05BD.3080402@udel.edu>

On 11/20/2012 3:35 PM, barry.warsaw wrote:

>           for entry in path:
> +            if not isinstance(entry, (str, bytes)):
> +                continue

Given that a non-(str,bytes) entry could indicate a programming error, 
should a warning be emitted before continuing?

Terry

From barry at python.org  Wed Nov 21 00:41:07 2012
From: barry at python.org (Barry Warsaw)
Date: Tue, 20 Nov 2012 18:41:07 -0500
Subject: [Python-checkins] cpython (3.3): - Issue #16514: Fix regression
 causing a traceback when sys.path[0] is None
In-Reply-To: <50AC05BD.3080402@udel.edu>
References: <3Y5dwB3ZCMzMlG@mail.python.org>
	<50AC05BD.3080402@udel.edu>
Message-ID: <20121120184107.16713a99@limelight.wooz.org>

On Nov 20, 2012, at 05:35 PM, Terry Reedy wrote:

>On 11/20/2012 3:35 PM, barry.warsaw wrote:
>
>>           for entry in path:
>> +            if not isinstance(entry, (str, bytes)):
>> +                continue
>
>Given that a non-(str,bytes) entry could indicate a programming error, should
>a warning be emitted before continuing?

That's not what happens in Python 3.2.  In fact, this bug report was triggered
by someone who was already inserting None to sys.path[0].  It is silently
ignored in Python 3.2, but tracebacked in 3.3.

Cheers,
-Barry

From python-checkins at python.org  Wed Nov 21 02:56:12 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 02:56:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSW1wcm92ZSBzdHIo?=
 =?utf-8?b?KSBhbmQgb2JqZWN0Ll9fc3RyX18oKSBkb2N1bWVudGF0aW9uIChpc3N1ZSAj?=
 =?utf-8?q?13538=29=2E?=
Message-ID: <3Y5n241kNZzPt0@mail.python.org>

http://hg.python.org/cpython/rev/f32f1cb508ad
changeset:   80540:f32f1cb508ad
branch:      3.2
parent:      80532:a3579d766fb6
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Tue Nov 20 17:31:02 2012 -0800
summary:
  Improve str() and object.__str__() documentation (issue #13538).

files:
  Doc/c-api/buffer.rst        |  12 ++-
  Doc/library/functions.rst   |  65 +++++++++++++++----------
  Doc/library/stdtypes.rst    |  14 +++-
  Doc/reference/datamodel.rst |  28 ++++++---
  Lib/test/test_builtin.py    |   1 +
  Lib/test/test_unicode.py    |  20 +++++++
  Misc/NEWS                   |   2 +
  7 files changed, 97 insertions(+), 45 deletions(-)


diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -1,5 +1,10 @@
 .. highlightlang:: c
 
+.. index::
+   single: buffer protocol
+   single: buffer interface; (see buffer protocol)
+   single: buffer object; (see buffer protocol)
+
 .. _bufferobjects:
 
 Buffer Protocol
@@ -9,9 +14,6 @@
 .. sectionauthor:: Benjamin Peterson
 
 
-.. index::
-   single: buffer interface
-
 Certain objects available in Python wrap access to an underlying memory
 array or *buffer*.  Such objects include the built-in :class:`bytes` and
 :class:`bytearray`, and some extension types like :class:`array.array`.
@@ -23,8 +25,8 @@
 then desireable, in some situations, to access that buffer directly and
 without intermediate copying.
 
-Python provides such a facility at the C level in the form of the *buffer
-protocol*.  This protocol has two sides:
+Python provides such a facility at the C level in the form of the :ref:`buffer
+protocol <bufferobjects>`.  This protocol has two sides:
 
 .. index:: single: PyBufferProcs
 
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -528,7 +528,7 @@
    is used by most built-in types: :ref:`formatspec`.
 
    The default *format_spec* is an empty string which usually gives the same
-   effect as calling ``str(value)``.
+   effect as calling :func:`str(value) <str>`.
 
    A call to ``format(value, format_spec)`` is translated to
    ``type(value).__format__(format_spec)`` which bypasses the instance
@@ -1246,38 +1246,51 @@
    For more information on static methods, consult the documentation on the
    standard type hierarchy in :ref:`types`.
 
+   .. index::
+      single: string; str() (built-in function)
+
 
 .. function:: str(object='')
-              str(object[, encoding[, errors]])
+              str(object=b'', encoding='utf-8', errors='strict')
 
-   Return a string version of an object, using one of the following modes:
+   Return a :ref:`string <typesseq>` version of *object*.  If *object* is not
+   provided, returns the empty string.  Otherwise, the behavior of ``str()``
+   depends on whether *encoding* or *errors* is given, as follows.
 
-   If *encoding* and/or *errors* are given, :func:`str` will decode the
-   *object* which can either be a byte string or a character buffer using
-   the codec for *encoding*. The *encoding* parameter is a string giving
-   the name of an encoding; if the encoding is not known, :exc:`LookupError`
-   is raised.  Error handling is done according to *errors*; this specifies the
-   treatment of characters which are invalid in the input encoding. If
-   *errors* is ``'strict'`` (the default), a :exc:`ValueError` is raised on
-   errors, while a value of ``'ignore'`` causes errors to be silently ignored,
-   and a value of ``'replace'`` causes the official Unicode replacement character,
-   U+FFFD, to be used to replace input characters which cannot be decoded.
-   See also the :mod:`codecs` module.
+   If neither *encoding* nor *errors* is given, ``str(object)`` returns
+   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
+   printable string representation of *object*.  For string objects, this is
+   the string itself.  If *object* does not have a :meth:`~object.__str__`
+   method, then :func:`str` falls back to returning
+   :meth:`repr(object) <repr>`.
 
-   When only *object* is given, this returns its nicely printable representation.
-   For strings, this is the string itself.  The difference with ``repr(object)``
-   is that ``str(object)`` does not always attempt to return a string that is
-   acceptable to :func:`eval`; its goal is to return a printable string.
-   With no arguments, this returns the empty string.
+   .. index::
+      single: buffer protocol; str() (built-in function)
+      single: bytes; str() (built-in function)
 
-   Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
-   special method.
+   If at least one of *encoding* or *errors* is given, *object* should be a
+   :class:`bytes` or :class:`bytearray` object, or more generally any object
+   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
+   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
+   ``str(bytes, encoding, errors)`` is equivalent to
+   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
+   object underlying the buffer object is obtained before calling
+   :meth:`bytes.decode`.  See the :ref:`typesseq` section, the
+   :ref:`typememoryview` section, and :ref:`bufferobjects` for information on
+   buffer objects.
 
-   For more information on strings see :ref:`typesseq` which describes sequence
-   functionality (strings are sequences), and also the string-specific methods
-   described in the :ref:`string-methods` section. To output formatted strings,
-   see the :ref:`string-formatting` section. In addition see the
-   :ref:`stringservices` section.
+   Passing a :class:`bytes` object to :func:`str` without the *encoding*
+   or *errors* arguments falls under the first case of returning the informal
+   string representation (see also the :option:`-b` command-line option to
+   Python).  For example::
+
+      >>> str(b'Zoot!')
+      "b'Zoot!'"
+
+   ``str`` is a built-in :term:`type`.  For more information on the string
+   type and its methods, see the :ref:`typesseq` and :ref:`string-methods`
+   sections.  To output formatted strings, see the :ref:`string-formatting`
+   section.  In addition, see the :ref:`stringservices` section.
 
 
 .. function:: sum(iterable[, start])
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -794,6 +794,9 @@
 the yield expression <yieldexpr>`.
 
 
+.. index::
+   single: string; sequence types
+
 .. _typesseq:
 
 Sequence Types --- :class:`str`, :class:`bytes`, :class:`bytearray`, :class:`list`, :class:`tuple`, :class:`range`
@@ -804,17 +807,20 @@
 other containers see the built in :class:`dict` and :class:`set` classes, and
 the :mod:`collections` module.
 
-
 .. index::
    object: sequence
-   object: string
    object: bytes
    object: bytearray
    object: tuple
    object: list
    object: range
-
-Strings contain Unicode characters.  Their literals are written in single or
+   object: string
+   single: string
+   single: str() (built-in function); (see also string)
+
+Textual data in Python is handled with :class:`str` objects, or :dfn:`strings`.
+Strings are immutable :ref:`sequences <typesseq>` of Unicode code points.
+String literals are written in single or
 double quotes: ``'xyzzy'``, ``"frobozz"``.  See :ref:`strings` for more about
 string literals.  In addition to the functionality described here, there are
 also string-specific methods described in the :ref:`string-methods` section.
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1124,11 +1124,12 @@
       modules are still available at the time when the :meth:`__del__` method is
       called.
 
+      .. index::
+         single: repr() (built-in function); __repr__() (object method)
+
 
 .. method:: object.__repr__(self)
 
-   .. index:: builtin: repr
-
    Called by the :func:`repr` built-in function to compute the "official" string
    representation of an object.  If at all possible, this should look like a
    valid Python expression that could be used to recreate an object with the
@@ -1141,18 +1142,25 @@
    This is typically used for debugging, so it is important that the representation
    is information-rich and unambiguous.
 
+   .. index::
+      single: string; __str__() (object method)
+      single: format() (built-in function); __str__() (object method)
+      single: print() (built-in function); __str__() (object method)
+
 
 .. method:: object.__str__(self)
 
-   .. index::
-      builtin: str
-      builtin: print
+   Called by :func:`str(object) <str>` and the built-in functions
+   :func:`format` and :func:`print` to compute the "informal" or nicely
+   printable string representation of an object.  The return value must be a
+   :ref:`string <textseq>` object.
 
-   Called by the :func:`str` built-in function and by the :func:`print` function
-   to compute the "informal" string representation of an object.  This differs
-   from :meth:`__repr__` in that it does not have to be a valid Python
-   expression: a more convenient or concise representation may be used instead.
-   The return value must be a string object.
+   This method differs from :meth:`object.__repr__` in that there is no
+   expectation that :meth:`__str__` return a valid Python expression: a more
+   convenient or concise representation can be used.
+
+   The default implementation defined by the built-in type :class:`object`
+   calls :meth:`object.__repr__`.
 
    .. XXX what about subclasses of string?
 
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1184,6 +1184,7 @@
         self.assertRaises(TypeError, setattr, sys, 1, 'spam')
         self.assertRaises(TypeError, setattr)
 
+    # test_str(): see test_unicode.py and test_bytes.py for str() tests.
 
     def test_sum(self):
         self.assertEqual(sum([]), 0)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1100,6 +1100,26 @@
 
         self.assertRaises(TypeError, str, 42, 42, 42)
 
+    def test_constructor_keyword_args(self):
+        """Pass various keyword argument combinations to the constructor."""
+        # The object argument can be passed as a keyword.
+        self.assertEqual(str(object='foo'), 'foo')
+        self.assertEqual(str(object=b'foo', encoding='utf-8'), 'foo')
+        # The errors argument without encoding triggers "decode" mode.
+        self.assertEqual(str(b'foo', errors='strict'), 'foo')  # not "b'foo'"
+        self.assertEqual(str(object=b'foo', errors='strict'), 'foo')
+
+    def test_constructor_defaults(self):
+        """Check the constructor argument defaults."""
+        # The object argument defaults to '' or b''.
+        self.assertEqual(str(), '')
+        self.assertEqual(str(errors='strict'), '')
+        utf8_cent = '?'.encode('utf-8')
+        # The encoding argument defaults to utf-8.
+        self.assertEqual(str(utf8_cent, errors='strict'), '?')
+        # The errors argument defaults to strict.
+        self.assertRaises(UnicodeDecodeError, str, utf8_cent, encoding='ascii')
+
     def test_codecs_utf7(self):
         utfTests = [
             ('A\u2262\u0391.', b'A+ImIDkQ.'),             # RFC2152 example
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -731,6 +731,8 @@
 Documentation
 -------------
 
+- Issue #13538: Improve str() and object.__str__() documentation.
+
 - Issue #16400: Update the description of which versions of a given package
   PyPI displays.
 

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

From python-checkins at python.org  Wed Nov 21 02:56:13 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 02:56:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Null_merge_from_3=2E2_=28issue_=2313538=29=2E?=
Message-ID: <3Y5n254HjpzPt0@mail.python.org>

http://hg.python.org/cpython/rev/6630a1c42204
changeset:   80541:6630a1c42204
branch:      3.3
parent:      80538:7bf09b2037f0
parent:      80540:f32f1cb508ad
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Tue Nov 20 17:44:02 2012 -0800
summary:
  Null merge from 3.2 (issue #13538).

files:



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

From python-checkins at python.org  Wed Nov 21 02:56:15 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 02:56:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSW1wcm92ZSBzdHIo?=
 =?utf-8?b?KSBhbmQgb2JqZWN0Ll9fc3RyX18oKSBkb2N1bWVudGF0aW9uIChpc3N1ZSAj?=
 =?utf-8?q?13538=29=2E?=
Message-ID: <3Y5n270sxczQ83@mail.python.org>

http://hg.python.org/cpython/rev/325f80d792b9
changeset:   80542:325f80d792b9
branch:      3.3
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Tue Nov 20 17:45:51 2012 -0800
summary:
  Improve str() and object.__str__() documentation (issue #13538).

files:
  Doc/c-api/buffer.rst        |  12 ++--
  Doc/library/functions.rst   |  61 +++++++++++++++---------
  Doc/library/stdtypes.rst    |  25 ++++++----
  Doc/reference/datamodel.rst |  30 +++++++----
  Lib/test/test_builtin.py    |   1 +
  Lib/test/test_unicode.py    |  20 ++++++++
  Misc/NEWS                   |   2 +
  7 files changed, 101 insertions(+), 50 deletions(-)


diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -1,5 +1,10 @@
 .. highlightlang:: c
 
+.. index::
+   single: buffer protocol
+   single: buffer interface; (see buffer protocol)
+   single: buffer object; (see buffer protocol)
+
 .. _bufferobjects:
 
 Buffer Protocol
@@ -10,9 +15,6 @@
 .. sectionauthor:: Stefan Krah
 
 
-.. index::
-   single: buffer interface
-
 Certain objects available in Python wrap access to an underlying memory
 array or *buffer*.  Such objects include the built-in :class:`bytes` and
 :class:`bytearray`, and some extension types like :class:`array.array`.
@@ -24,8 +26,8 @@
 then desirable, in some situations, to access that buffer directly and
 without intermediate copying.
 
-Python provides such a facility at the C level in the form of the *buffer
-protocol*.  This protocol has two sides:
+Python provides such a facility at the C level in the form of the :ref:`buffer
+protocol <bufferobjects>`.  This protocol has two sides:
 
 .. index:: single: PyBufferProcs
 
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -534,7 +534,7 @@
    is used by most built-in types: :ref:`formatspec`.
 
    The default *format_spec* is an empty string which usually gives the same
-   effect as calling ``str(value)``.
+   effect as calling :func:`str(value) <str>`.
 
    A call to ``format(value, format_spec)`` is translated to
    ``type(value).__format__(format_spec)`` which bypasses the instance
@@ -1249,37 +1249,50 @@
    For more information on static methods, consult the documentation on the
    standard type hierarchy in :ref:`types`.
 
+   .. index::
+      single: string; str() (built-in function)
+
 
 .. _func-str:
 .. function:: str(object='')
-              str(object[, encoding[, errors]])
+              str(object=b'', encoding='utf-8', errors='strict')
 
-   Return a :ref:`string <textseq>` version of an object, using one of the
-   following modes:
+   Return a :ref:`string <textseq>` version of *object*.  If *object* is not
+   provided, returns the empty string.  Otherwise, the behavior of ``str()``
+   depends on whether *encoding* or *errors* is given, as follows.
 
-   If *encoding* and/or *errors* are given, :func:`str` will decode the
-   *object* which can either be a byte string or a character buffer using
-   the codec for *encoding*. The *encoding* parameter is a string giving
-   the name of an encoding; if the encoding is not known, :exc:`LookupError`
-   is raised.  Error handling is done according to *errors*; this specifies the
-   treatment of characters which are invalid in the input encoding. If
-   *errors* is ``'strict'`` (the default), a :exc:`ValueError` is raised on
-   errors, while a value of ``'ignore'`` causes errors to be silently ignored,
-   and a value of ``'replace'`` causes the official Unicode replacement character,
-   U+FFFD, to be used to replace input characters which cannot be decoded.
-   See also the :mod:`codecs` module.
+   If neither *encoding* nor *errors* is given, ``str(object)`` returns
+   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
+   printable string representation of *object*.  For string objects, this is
+   the string itself.  If *object* does not have a :meth:`~object.__str__`
+   method, then :func:`str` falls back to returning
+   :meth:`repr(object) <repr>`.
 
-   When only *object* is given, this returns its nicely printable representation.
-   For strings, this is the string itself.  The difference with ``repr(object)``
-   is that ``str(object)`` does not always attempt to return a string that is
-   acceptable to :func:`eval`; its goal is to return a printable string.
-   With no arguments, this returns the empty string.
+   .. index::
+      single: buffer protocol; str() (built-in function)
+      single: bytes; str() (built-in function)
 
-   Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
-   special method.
+   If at least one of *encoding* or *errors* is given, *object* should be a
+   :class:`bytes` or :class:`bytearray` object, or more generally any object
+   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
+   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
+   ``str(bytes, encoding, errors)`` is equivalent to
+   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
+   object underlying the buffer object is obtained before calling
+   :meth:`bytes.decode`.  See :ref:`binaryseq` and
+   :ref:`bufferobjects` for information on buffer objects.
 
-   For more information on strings and string methods, see the :ref:`textseq`
-   section.  To output formatted strings, see the :ref:`string-formatting`
+   Passing a :class:`bytes` object to :func:`str` without the *encoding*
+   or *errors* arguments falls under the first case of returning the informal
+   string representation (see also the :option:`-b` command-line option to
+   Python).  For example::
+
+      >>> str(b'Zoot!')
+      "b'Zoot!'"
+
+   ``str`` is a built-in :term:`type`.  For more information on the string
+   type and its methods, see the :ref:`textseq` and :ref:`string-methods`
+   sections.  To output formatted strings, see the :ref:`string-formatting`
    section.  In addition, see the :ref:`stringservices` section.
 
 
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1346,19 +1346,18 @@
    The :attr:`start`, :attr:`stop` and :attr:`step` attributes.
 
 
+.. index::
+   single: string; text sequence type
+   single: str() (built-in function); (see also string)
+   object: string
+
 .. _textseq:
 
 Text Sequence Type --- :class:`str`
 ===================================
 
-.. index::
-   object: string
-   object: bytes
-   object: bytearray
-   object: io.StringIO
-
-
-Textual data in Python is handled with ``str`` objects, which are immutable
+Textual data in Python is handled with :class:`str` objects, or :dfn:`strings`.
+Strings are immutable
 :ref:`sequences <typesseq>` of Unicode code points.  String literals are
 written in a variety of ways:
 
@@ -1383,6 +1382,9 @@
 Since there is no separate "character" type, indexing a string produces
 strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``.
 
+.. index::
+   object: io.StringIO
+
 There is also no mutable string type, but :meth:`str.join` or
 :class:`io.StringIO` can be used to efficiently construct strings from
 multiple fragments.
@@ -2064,6 +2066,9 @@
    longer replaced by ``%g`` conversions.
 
 
+.. index::
+   single: buffer protocol; binary sequence types
+
 .. _binaryseq:
 
 Binary Sequence Types --- :class:`bytes`, :class:`bytearray`, :class:`memoryview`
@@ -2077,8 +2082,8 @@
 
 The core built-in types for manipulating binary data are :class:`bytes` and
 :class:`bytearray`. They are supported by :class:`memoryview` which uses
-the buffer protocol to access the memory of other binary objects without
-needing to make a copy.
+the :ref:`buffer protocol <bufferobjects>` to access the memory of other
+binary objects without needing to make a copy.
 
 The :mod:`array` module supports efficient storage of basic data types like
 32-bit integers and IEEE754 double-precision floating values.
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1140,11 +1140,12 @@
       modules are still available at the time when the :meth:`__del__` method is
       called.
 
+      .. index::
+         single: repr() (built-in function); __repr__() (object method)
+
 
 .. method:: object.__repr__(self)
 
-   .. index:: builtin: repr
-
    Called by the :func:`repr` built-in function to compute the "official" string
    representation of an object.  If at all possible, this should look like a
    valid Python expression that could be used to recreate an object with the
@@ -1157,18 +1158,25 @@
    This is typically used for debugging, so it is important that the representation
    is information-rich and unambiguous.
 
+   .. index::
+      single: string; __str__() (object method)
+      single: format() (built-in function); __str__() (object method)
+      single: print() (built-in function); __str__() (object method)
+
 
 .. method:: object.__str__(self)
 
-   .. index::
-      builtin: str
-      builtin: print
-
-   Called by the :func:`str` built-in function and by the :func:`print` function
-   to compute the "informal" string representation of an object.  This differs
-   from :meth:`__repr__` in that it does not have to be a valid Python
-   expression: a more convenient or concise representation may be used instead.
-   The return value must be a string object.
+   Called by :func:`str(object) <str>` and the built-in functions
+   :func:`format` and :func:`print` to compute the "informal" or nicely
+   printable string representation of an object.  The return value must be a
+   :ref:`string <textseq>` object.
+
+   This method differs from :meth:`object.__repr__` in that there is no
+   expectation that :meth:`__str__` return a valid Python expression: a more
+   convenient or concise representation can be used.
+
+   The default implementation defined by the built-in type :class:`object`
+   calls :meth:`object.__repr__`.
 
    .. XXX what about subclasses of string?
 
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1286,6 +1286,7 @@
         self.assertRaises(TypeError, setattr, sys, 1, 'spam')
         self.assertRaises(TypeError, setattr)
 
+    # test_str(): see test_unicode.py and test_bytes.py for str() tests.
 
     def test_sum(self):
         self.assertEqual(sum([]), 0)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1182,6 +1182,26 @@
 
         self.assertRaises(TypeError, str, 42, 42, 42)
 
+    def test_constructor_keyword_args(self):
+        """Pass various keyword argument combinations to the constructor."""
+        # The object argument can be passed as a keyword.
+        self.assertEqual(str(object='foo'), 'foo')
+        self.assertEqual(str(object=b'foo', encoding='utf-8'), 'foo')
+        # The errors argument without encoding triggers "decode" mode.
+        self.assertEqual(str(b'foo', errors='strict'), 'foo')  # not "b'foo'"
+        self.assertEqual(str(object=b'foo', errors='strict'), 'foo')
+
+    def test_constructor_defaults(self):
+        """Check the constructor argument defaults."""
+        # The object argument defaults to '' or b''.
+        self.assertEqual(str(), '')
+        self.assertEqual(str(errors='strict'), '')
+        utf8_cent = '?'.encode('utf-8')
+        # The encoding argument defaults to utf-8.
+        self.assertEqual(str(utf8_cent, errors='strict'), '?')
+        # The errors argument defaults to strict.
+        self.assertRaises(UnicodeDecodeError, str, utf8_cent, encoding='ascii')
+
     def test_codecs_utf7(self):
         utfTests = [
             ('A\u2262\u0391.', b'A+ImIDkQ.'),             # RFC2152 example
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -283,6 +283,8 @@
 Documentation
 -------------
 
+- Issue #13538: Improve str() and object.__str__() documentation.
+
 - Issue #16489: Make it clearer that importlib.find_loader() requires any and
   all packages to be separately imported.
 

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

From python-checkins at python.org  Wed Nov 21 02:56:16 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 02:56:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogTWVyZ2UgZnJvbSAzLjM6IEltcHJvdmUgc3RyKCkgYW5kIG9iamVjdC5f?=
 =?utf-8?b?X3N0cl9fKCkgZG9jcyAoaXNzdWUgIzEzNTM4KS4=?=
Message-ID: <3Y5n284kzXzQCS@mail.python.org>

http://hg.python.org/cpython/rev/59acd5cac8b5
changeset:   80543:59acd5cac8b5
parent:      80539:ead853fe9836
parent:      80542:325f80d792b9
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Tue Nov 20 17:53:17 2012 -0800
summary:
  Merge from 3.3: Improve str() and object.__str__() docs (issue #13538).

files:
  Doc/c-api/buffer.rst        |  12 ++--
  Doc/library/functions.rst   |  61 +++++++++++++++---------
  Doc/library/stdtypes.rst    |  25 ++++++----
  Doc/reference/datamodel.rst |  30 +++++++----
  Lib/test/test_builtin.py    |   1 +
  Lib/test/test_unicode.py    |  20 ++++++++
  Misc/NEWS                   |   2 +
  7 files changed, 101 insertions(+), 50 deletions(-)


diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -1,5 +1,10 @@
 .. highlightlang:: c
 
+.. index::
+   single: buffer protocol
+   single: buffer interface; (see buffer protocol)
+   single: buffer object; (see buffer protocol)
+
 .. _bufferobjects:
 
 Buffer Protocol
@@ -10,9 +15,6 @@
 .. sectionauthor:: Stefan Krah
 
 
-.. index::
-   single: buffer interface
-
 Certain objects available in Python wrap access to an underlying memory
 array or *buffer*.  Such objects include the built-in :class:`bytes` and
 :class:`bytearray`, and some extension types like :class:`array.array`.
@@ -24,8 +26,8 @@
 then desirable, in some situations, to access that buffer directly and
 without intermediate copying.
 
-Python provides such a facility at the C level in the form of the *buffer
-protocol*.  This protocol has two sides:
+Python provides such a facility at the C level in the form of the :ref:`buffer
+protocol <bufferobjects>`.  This protocol has two sides:
 
 .. index:: single: PyBufferProcs
 
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -534,7 +534,7 @@
    is used by most built-in types: :ref:`formatspec`.
 
    The default *format_spec* is an empty string which usually gives the same
-   effect as calling ``str(value)``.
+   effect as calling :func:`str(value) <str>`.
 
    A call to ``format(value, format_spec)`` is translated to
    ``type(value).__format__(format_spec)`` which bypasses the instance
@@ -1249,37 +1249,50 @@
    For more information on static methods, consult the documentation on the
    standard type hierarchy in :ref:`types`.
 
+   .. index::
+      single: string; str() (built-in function)
+
 
 .. _func-str:
 .. function:: str(object='')
-              str(object[, encoding[, errors]])
+              str(object=b'', encoding='utf-8', errors='strict')
 
-   Return a :ref:`string <textseq>` version of an object, using one of the
-   following modes:
+   Return a :ref:`string <textseq>` version of *object*.  If *object* is not
+   provided, returns the empty string.  Otherwise, the behavior of ``str()``
+   depends on whether *encoding* or *errors* is given, as follows.
 
-   If *encoding* and/or *errors* are given, :func:`str` will decode the
-   *object* which can either be a byte string or a character buffer using
-   the codec for *encoding*. The *encoding* parameter is a string giving
-   the name of an encoding; if the encoding is not known, :exc:`LookupError`
-   is raised.  Error handling is done according to *errors*; this specifies the
-   treatment of characters which are invalid in the input encoding. If
-   *errors* is ``'strict'`` (the default), a :exc:`ValueError` is raised on
-   errors, while a value of ``'ignore'`` causes errors to be silently ignored,
-   and a value of ``'replace'`` causes the official Unicode replacement character,
-   U+FFFD, to be used to replace input characters which cannot be decoded.
-   See also the :mod:`codecs` module.
+   If neither *encoding* nor *errors* is given, ``str(object)`` returns
+   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
+   printable string representation of *object*.  For string objects, this is
+   the string itself.  If *object* does not have a :meth:`~object.__str__`
+   method, then :func:`str` falls back to returning
+   :meth:`repr(object) <repr>`.
 
-   When only *object* is given, this returns its nicely printable representation.
-   For strings, this is the string itself.  The difference with ``repr(object)``
-   is that ``str(object)`` does not always attempt to return a string that is
-   acceptable to :func:`eval`; its goal is to return a printable string.
-   With no arguments, this returns the empty string.
+   .. index::
+      single: buffer protocol; str() (built-in function)
+      single: bytes; str() (built-in function)
 
-   Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
-   special method.
+   If at least one of *encoding* or *errors* is given, *object* should be a
+   :class:`bytes` or :class:`bytearray` object, or more generally any object
+   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
+   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
+   ``str(bytes, encoding, errors)`` is equivalent to
+   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
+   object underlying the buffer object is obtained before calling
+   :meth:`bytes.decode`.  See :ref:`binaryseq` and
+   :ref:`bufferobjects` for information on buffer objects.
 
-   For more information on strings and string methods, see the :ref:`textseq`
-   section.  To output formatted strings, see the :ref:`string-formatting`
+   Passing a :class:`bytes` object to :func:`str` without the *encoding*
+   or *errors* arguments falls under the first case of returning the informal
+   string representation (see also the :option:`-b` command-line option to
+   Python).  For example::
+
+      >>> str(b'Zoot!')
+      "b'Zoot!'"
+
+   ``str`` is a built-in :term:`type`.  For more information on the string
+   type and its methods, see the :ref:`textseq` and :ref:`string-methods`
+   sections.  To output formatted strings, see the :ref:`string-formatting`
    section.  In addition, see the :ref:`stringservices` section.
 
 
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1346,19 +1346,18 @@
    The :attr:`start`, :attr:`stop` and :attr:`step` attributes.
 
 
+.. index::
+   single: string; text sequence type
+   single: str() (built-in function); (see also string)
+   object: string
+
 .. _textseq:
 
 Text Sequence Type --- :class:`str`
 ===================================
 
-.. index::
-   object: string
-   object: bytes
-   object: bytearray
-   object: io.StringIO
-
-
-Textual data in Python is handled with ``str`` objects, which are immutable
+Textual data in Python is handled with :class:`str` objects, or :dfn:`strings`.
+Strings are immutable
 :ref:`sequences <typesseq>` of Unicode code points.  String literals are
 written in a variety of ways:
 
@@ -1383,6 +1382,9 @@
 Since there is no separate "character" type, indexing a string produces
 strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``.
 
+.. index::
+   object: io.StringIO
+
 There is also no mutable string type, but :meth:`str.join` or
 :class:`io.StringIO` can be used to efficiently construct strings from
 multiple fragments.
@@ -2064,6 +2066,9 @@
    longer replaced by ``%g`` conversions.
 
 
+.. index::
+   single: buffer protocol; binary sequence types
+
 .. _binaryseq:
 
 Binary Sequence Types --- :class:`bytes`, :class:`bytearray`, :class:`memoryview`
@@ -2077,8 +2082,8 @@
 
 The core built-in types for manipulating binary data are :class:`bytes` and
 :class:`bytearray`. They are supported by :class:`memoryview` which uses
-the buffer protocol to access the memory of other binary objects without
-needing to make a copy.
+the :ref:`buffer protocol <bufferobjects>` to access the memory of other
+binary objects without needing to make a copy.
 
 The :mod:`array` module supports efficient storage of basic data types like
 32-bit integers and IEEE754 double-precision floating values.
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1140,11 +1140,12 @@
       modules are still available at the time when the :meth:`__del__` method is
       called.
 
+      .. index::
+         single: repr() (built-in function); __repr__() (object method)
+
 
 .. method:: object.__repr__(self)
 
-   .. index:: builtin: repr
-
    Called by the :func:`repr` built-in function to compute the "official" string
    representation of an object.  If at all possible, this should look like a
    valid Python expression that could be used to recreate an object with the
@@ -1157,18 +1158,25 @@
    This is typically used for debugging, so it is important that the representation
    is information-rich and unambiguous.
 
+   .. index::
+      single: string; __str__() (object method)
+      single: format() (built-in function); __str__() (object method)
+      single: print() (built-in function); __str__() (object method)
+
 
 .. method:: object.__str__(self)
 
-   .. index::
-      builtin: str
-      builtin: print
-
-   Called by the :func:`str` built-in function and by the :func:`print` function
-   to compute the "informal" string representation of an object.  This differs
-   from :meth:`__repr__` in that it does not have to be a valid Python
-   expression: a more convenient or concise representation may be used instead.
-   The return value must be a string object.
+   Called by :func:`str(object) <str>` and the built-in functions
+   :func:`format` and :func:`print` to compute the "informal" or nicely
+   printable string representation of an object.  The return value must be a
+   :ref:`string <textseq>` object.
+
+   This method differs from :meth:`object.__repr__` in that there is no
+   expectation that :meth:`__str__` return a valid Python expression: a more
+   convenient or concise representation can be used.
+
+   The default implementation defined by the built-in type :class:`object`
+   calls :meth:`object.__repr__`.
 
    .. XXX what about subclasses of string?
 
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1286,6 +1286,7 @@
         self.assertRaises(TypeError, setattr, sys, 1, 'spam')
         self.assertRaises(TypeError, setattr)
 
+    # test_str(): see test_unicode.py and test_bytes.py for str() tests.
 
     def test_sum(self):
         self.assertEqual(sum([]), 0)
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1182,6 +1182,26 @@
 
         self.assertRaises(TypeError, str, 42, 42, 42)
 
+    def test_constructor_keyword_args(self):
+        """Pass various keyword argument combinations to the constructor."""
+        # The object argument can be passed as a keyword.
+        self.assertEqual(str(object='foo'), 'foo')
+        self.assertEqual(str(object=b'foo', encoding='utf-8'), 'foo')
+        # The errors argument without encoding triggers "decode" mode.
+        self.assertEqual(str(b'foo', errors='strict'), 'foo')  # not "b'foo'"
+        self.assertEqual(str(object=b'foo', errors='strict'), 'foo')
+
+    def test_constructor_defaults(self):
+        """Check the constructor argument defaults."""
+        # The object argument defaults to '' or b''.
+        self.assertEqual(str(), '')
+        self.assertEqual(str(errors='strict'), '')
+        utf8_cent = '?'.encode('utf-8')
+        # The encoding argument defaults to utf-8.
+        self.assertEqual(str(utf8_cent, errors='strict'), '?')
+        # The errors argument defaults to strict.
+        self.assertRaises(UnicodeDecodeError, str, utf8_cent, encoding='ascii')
+
     def test_codecs_utf7(self):
         utfTests = [
             ('A\u2262\u0391.', b'A+ImIDkQ.'),             # RFC2152 example
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -395,6 +395,8 @@
 Documentation
 -------------
 
+- Issue #13538: Improve str() and object.__str__() documentation.
+
 - Issue #16489: Make it clearer that importlib.find_loader() needs parent
   packages to be explicitly imported.
 

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

From solipsis at pitrou.net  Wed Nov 21 05:56:55 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 21 Nov 2012 05:56:55 +0100
Subject: [Python-checkins] Daily reference leaks (59acd5cac8b5): sum=0
Message-ID: <E1Tb2Mp-0007xU-EW@ap.vmr.nerim.net>

results for 59acd5cac8b5 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Wed Nov 21 06:11:33 2012
From: python-checkins at python.org (raymond.hettinger)
Date: Wed, 21 Nov 2012 06:11:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRml0IG5pdDogIHRo?=
 =?utf-8?q?e_return_got_dropped_from_an_earlier_check-in?=
Message-ID: <3Y5sMT1sThzQMn@mail.python.org>

http://hg.python.org/cpython/rev/6fe34156782b
changeset:   80544:6fe34156782b
branch:      2.7
parent:      80531:10314c9b7c5a
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Nov 20 21:11:26 2012 -0800
summary:
  Fit nit:  the return got dropped from an earlier check-in

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


diff --git a/Lib/collections.py b/Lib/collections.py
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -58,7 +58,7 @@
             root = self.__root
             last = root[PREV]
             last[NEXT] = root[PREV] = self.__map[key] = [last, root, key]
-        dict_setitem(self, key, value)
+        return dict_setitem(self, key, value)
 
     def __delitem__(self, key, PREV=0, NEXT=1, dict_delitem=dict.__delitem__):
         'od.__delitem__(y) <==> del od[y]'

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

From python-checkins at python.org  Wed Nov 21 06:42:50 2012
From: python-checkins at python.org (raymond.hettinger)
Date: Wed, 21 Nov 2012 06:42:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Remove_steps_n?=
 =?utf-8?q?o_longer_needed_once_=5F=5Fdel=5F=5F_was_removed?=
Message-ID: <3Y5t3Z4gStzQ3p@mail.python.org>

http://hg.python.org/cpython/rev/081cef8554fe
changeset:   80545:081cef8554fe
branch:      2.7
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Nov 20 21:42:44 2012 -0800
summary:
  Remove steps no longer needed once __del__ was removed

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


diff --git a/Lib/collections.py b/Lib/collections.py
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -91,8 +91,6 @@
 
     def clear(self):
         'od.clear() -> None.  Remove all items from od.'
-        for node in self.__map.itervalues():
-            del node[:]
         root = self.__root
         root[:] = [root, root, None]
         self.__map.clear()

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

From python-checkins at python.org  Wed Nov 21 14:38:32 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 14:38:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_label_in_d?=
 =?utf-8?q?ocs_=28from_issue_=2313538=29=2E?=
Message-ID: <3Y64cS47gmzRNx@mail.python.org>

http://hg.python.org/cpython/rev/5c39e3906ce9
changeset:   80546:5c39e3906ce9
branch:      3.2
parent:      80540:f32f1cb508ad
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 21 05:32:44 2012 -0800
summary:
  Fix label in docs (from issue #13538).

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


diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1153,7 +1153,7 @@
    Called by :func:`str(object) <str>` and the built-in functions
    :func:`format` and :func:`print` to compute the "informal" or nicely
    printable string representation of an object.  The return value must be a
-   :ref:`string <textseq>` object.
+   :ref:`string <typesseq>` object.
 
    This method differs from :meth:`object.__repr__` in that there is no
    expectation that :meth:`__str__` return a valid Python expression: a more

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

From python-checkins at python.org  Wed Nov 21 14:38:33 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 14:38:33 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Null_merge_from_3=2E2=2E?=
Message-ID: <3Y64cT6jyzzRQ6@mail.python.org>

http://hg.python.org/cpython/rev/62a57beb9eb2
changeset:   80547:62a57beb9eb2
branch:      3.3
parent:      80542:325f80d792b9
parent:      80546:5c39e3906ce9
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 21 05:34:26 2012 -0800
summary:
  Null merge from 3.2.

files:



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

From python-checkins at python.org  Wed Nov 21 14:38:35 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 21 Nov 2012 14:38:35 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Null_merge_from_3=2E3=2E?=
Message-ID: <3Y64cW1yXCzRQ9@mail.python.org>

http://hg.python.org/cpython/rev/eb26104b8f18
changeset:   80548:eb26104b8f18
parent:      80543:59acd5cac8b5
parent:      80547:62a57beb9eb2
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 21 05:36:10 2012 -0800
summary:
  Null merge from 3.3.

files:



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

From python-checkins at python.org  Wed Nov 21 17:37:25 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 21 Nov 2012 17:37:25 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Remove_unused_?=
 =?utf-8?q?variabile_=22plain=22_in_builtin=5Fexec=2E?=
Message-ID: <3Y68Zs6cF7zNrC@mail.python.org>

http://hg.python.org/cpython/rev/305d2aa5c129
changeset:   80549:305d2aa5c129
branch:      3.2
parent:      80546:5c39e3906ce9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Nov 21 18:36:08 2012 +0200
summary:
  Remove unused variabile "plain" in builtin_exec.

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


diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -793,7 +793,6 @@
 {
     PyObject *v;
     PyObject *prog, *globals = Py_None, *locals = Py_None;
-    int plain = 0;
 
     if (!PyArg_UnpackTuple(args, "exec", 1, 3, &prog, &globals, &locals))
         return NULL;
@@ -802,7 +801,6 @@
         globals = PyEval_GetGlobals();
         if (locals == Py_None) {
             locals = PyEval_GetLocals();
-            plain = 1;
         }
         if (!globals || !locals) {
             PyErr_SetString(PyExc_SystemError,

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

From python-checkins at python.org  Wed Nov 21 17:37:27 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 21 Nov 2012 17:37:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Null_merge_with_3=2E2=2E?=
Message-ID: <3Y68Zv1j8qzQT7@mail.python.org>

http://hg.python.org/cpython/rev/63a57de58ad9
changeset:   80550:63a57de58ad9
branch:      3.3
parent:      80547:62a57beb9eb2
parent:      80549:305d2aa5c129
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Nov 21 18:36:52 2012 +0200
summary:
  Null merge with 3.2.

files:



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

From python-checkins at python.org  Wed Nov 21 17:37:28 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 21 Nov 2012 17:37:28 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Null_merge_with_3=2E3=2E?=
Message-ID: <3Y68Zw3x3kzNrC@mail.python.org>

http://hg.python.org/cpython/rev/b9d72d13571b
changeset:   80551:b9d72d13571b
parent:      80548:eb26104b8f18
parent:      80550:63a57de58ad9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Nov 21 18:37:12 2012 +0200
summary:
  Null merge with 3.3.

files:



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

From python-checkins at python.org  Wed Nov 21 21:09:52 2012
From: python-checkins at python.org (r.david.murray)
Date: Wed, 21 Nov 2012 21:09:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316522=3A_Add_FAIL=5FFAS?=
	=?utf-8?q?T_flag_to_doctest=2E?=
Message-ID: <3Y6FJ057mhzRNp@mail.python.org>

http://hg.python.org/cpython/rev/966432a0734c
changeset:   80552:966432a0734c
user:        R David Murray <rdmurray at bitdance.com>
date:        Wed Nov 21 15:09:21 2012 -0500
summary:
  #16522: Add FAIL_FAST flag to doctest.

Patch by me, most of the work (doc and tests) by Daniel Urban.

files:
  Doc/library/doctest.rst  |  10 +++++
  Doc/whatsnew/3.4.rst     |   6 ++-
  Lib/doctest.py           |   8 ++++-
  Lib/test/test_doctest.py |  47 ++++++++++++++++++++++++++-
  Misc/NEWS                |   2 +
  5 files changed, 69 insertions(+), 4 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -633,6 +633,16 @@
    the output is suppressed.
 
 
+.. data:: FAIL_FAST
+
+   When specified, exit after the first failing example and don't attempt to run
+   the remaining examples. Thus, the number of failures reported will always be 1.
+   This flag may be useful during debugging, since examples after the first
+   failure won't even produce debugging output.
+
+   .. versionadded:: 3.4
+
+
 .. data:: REPORTING_FLAGS
 
    A bitmask or'ing together all the reporting flags above.
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
@@ -150,7 +150,11 @@
 Improved Modules
 ================
 
-* None yet.
+doctest
+-------
+
+Added ``FAIL_FAST`` flag to halt test running as soon as the first failure is
+detected.  (Contributed by R. David Murray and Daniel Urban in :issue:`16522`.)
 
 
 Optimizations
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -62,6 +62,7 @@
     'REPORT_NDIFF',
     'REPORT_ONLY_FIRST_FAILURE',
     'REPORTING_FLAGS',
+    'FAIL_FAST',
     # 1. Utility Functions
     # 2. Example & DocTest
     'Example',
@@ -150,11 +151,13 @@
 REPORT_CDIFF = register_optionflag('REPORT_CDIFF')
 REPORT_NDIFF = register_optionflag('REPORT_NDIFF')
 REPORT_ONLY_FIRST_FAILURE = register_optionflag('REPORT_ONLY_FIRST_FAILURE')
+FAIL_FAST = register_optionflag('FAIL_FAST')
 
 REPORTING_FLAGS = (REPORT_UDIFF |
                    REPORT_CDIFF |
                    REPORT_NDIFF |
-                   REPORT_ONLY_FIRST_FAILURE)
+                   REPORT_ONLY_FIRST_FAILURE |
+                   FAIL_FAST)
 
 # Special string markers for use in `want` strings:
 BLANKLINE_MARKER = '<BLANKLINE>'
@@ -1342,6 +1345,9 @@
             else:
                 assert False, ("unknown outcome", outcome)
 
+            if failures and self.optionflags & FAIL_FAST:
+                break
+
         # Restore the option flags (in case they were modified)
         self.optionflags = original_optionflags
 
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
@@ -1409,8 +1409,40 @@
         2
     TestResults(failed=3, attempted=5)
 
-For the purposes of REPORT_ONLY_FIRST_FAILURE, unexpected exceptions
-count as failures:
+The FAIL_FAST flag causes the runner to exit after the first failing example,
+so subsequent examples are not even attempted:
+
+    >>> flags = doctest.FAIL_FAST
+    >>> doctest.DocTestRunner(verbose=False, optionflags=flags).run(test)
+    ... # doctest: +ELLIPSIS
+    **********************************************************************
+    File ..., line 5, in f
+    Failed example:
+        print(2) # first failure
+    Expected:
+        200
+    Got:
+        2
+    TestResults(failed=1, attempted=2)
+
+Specifying both FAIL_FAST and REPORT_ONLY_FIRST_FAILURE is equivalent to
+FAIL_FAST only:
+
+    >>> flags = doctest.FAIL_FAST | doctest.REPORT_ONLY_FIRST_FAILURE
+    >>> doctest.DocTestRunner(verbose=False, optionflags=flags).run(test)
+    ... # doctest: +ELLIPSIS
+    **********************************************************************
+    File ..., line 5, in f
+    Failed example:
+        print(2) # first failure
+    Expected:
+        200
+    Got:
+        2
+    TestResults(failed=1, attempted=2)
+
+For the purposes of both REPORT_ONLY_FIRST_FAILURE and FAIL_FAST, unexpected
+exceptions count as failures:
 
     >>> def f(x):
     ...     r'''
@@ -1437,6 +1469,17 @@
         ...
         ValueError: 2
     TestResults(failed=3, attempted=5)
+    >>> flags = doctest.FAIL_FAST
+    >>> doctest.DocTestRunner(verbose=False, optionflags=flags).run(test)
+    ... # doctest: +ELLIPSIS
+    **********************************************************************
+    File ..., line 5, in f
+    Failed example:
+        raise ValueError(2) # first failure
+    Exception raised:
+        ...
+        ValueError: 2
+    TestResults(failed=1, attempted=2)
 
 New option flags can also be registered, via register_optionflag().  Here
 we reach into doctest's internals a bit.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,8 @@
 Library
 -------
 
+- Issue #16522: added FAIL_FAST flag to doctest.
+
 - Issue #15627: Add the importlib.abc.SourceLoader.compile_source() method.
 
 - Issue #16408: Fix file descriptors not being closed in error conditions

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

From python-checkins at python.org  Thu Nov 22 03:07:32 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Thu, 22 Nov 2012 03:07:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_instructions_for_hand?=
 =?utf-8?q?ling_merge_conflicts_during_null_merges=2E?=
Message-ID: <3Y6PDh5mRgzMvQ@mail.python.org>

http://hg.python.org/devguide/rev/78a69b929ab7
changeset:   573:78a69b929ab7
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 21 18:04:35 2012 -0800
summary:
  Add instructions for handling merge conflicts during null merges.

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


diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -306,17 +306,24 @@
    # Fix any conflicts; compile; run the test suite
    hg commit
 
+.. index:: null merging
+
 .. note::
-   *If the patch shouldn't be ported* from Python 3.3 to Python 3.4, you must
-   also make it explicit: merge the changes but revert them before committing::
+   If the patch should *not* be ported from Python 3.3 to Python 3.4, you must
+   also make this explicit by doing a *null merge*: merge the changes but
+   revert them before committing::
 
       hg update default
       hg merge 3.3
       hg revert -ar default
+      hg resolve -am  # needed only if the merge created conflicts
       hg commit
 
    This is necessary so that the merge gets recorded; otherwise, somebody
    else will have to make a decision about your patch when they try to merge.
+   (Using a three-way merge tool generally makes the ``hg resolve`` step
+   in the above unnecessary; also see `this bug report
+   <http://bz.selenic.com/show_bug.cgi?id=2706>`__.)
 
 When you have finished your porting work (you can port several patches one
 after another in your local repository), you can push **all** outstanding

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

From chris.jerdonek at gmail.com  Thu Nov 22 03:12:49 2012
From: chris.jerdonek at gmail.com (Chris Jerdonek)
Date: Wed, 21 Nov 2012 18:12:49 -0800
Subject: [Python-checkins] devguide: Add instructions for handling merge
 conflicts during null merges.
In-Reply-To: <3Y6PDh5mRgzMvQ@mail.python.org>
References: <3Y6PDh5mRgzMvQ@mail.python.org>
Message-ID: <CAOTb1wc+JqbaxMh7AoSyiNhKddfVsCrB2Q4DeiX=wsDiWx=rqw@mail.gmail.com>

On Wed, Nov 21, 2012 at 6:07 PM, chris.jerdonek
<python-checkins at python.org> wrote:
> http://hg.python.org/devguide/rev/78a69b929ab7
> changeset:   573:78a69b929ab7
> user:        Chris Jerdonek <chris.jerdonek at gmail.com>
> date:        Wed Nov 21 18:04:35 2012 -0800
> summary:
>   Add instructions for handling merge conflicts during null merges.

This was for issue #16517:

http://bugs.python.org/issue16517

--Chris


>
> files:
>   committing.rst |  11 +++++++++--
>   1 files changed, 9 insertions(+), 2 deletions(-)
>
>
> diff --git a/committing.rst b/committing.rst
> --- a/committing.rst
> +++ b/committing.rst
> @@ -306,17 +306,24 @@
>     # Fix any conflicts; compile; run the test suite
>     hg commit
>
> +.. index:: null merging
> +
>  .. note::
> -   *If the patch shouldn't be ported* from Python 3.3 to Python 3.4, you must
> -   also make it explicit: merge the changes but revert them before committing::
> +   If the patch should *not* be ported from Python 3.3 to Python 3.4, you must
> +   also make this explicit by doing a *null merge*: merge the changes but
> +   revert them before committing::
>
>        hg update default
>        hg merge 3.3
>        hg revert -ar default
> +      hg resolve -am  # needed only if the merge created conflicts
>        hg commit
>
>     This is necessary so that the merge gets recorded; otherwise, somebody
>     else will have to make a decision about your patch when they try to merge.
> +   (Using a three-way merge tool generally makes the ``hg resolve`` step
> +   in the above unnecessary; also see `this bug report
> +   <http://bz.selenic.com/show_bug.cgi?id=2706>`__.)
>
>  When you have finished your porting work (you can port several patches one
>  after another in your local repository), you can push **all** outstanding
>
> --
> Repository URL: http://hg.python.org/devguide
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>

From solipsis at pitrou.net  Thu Nov 22 05:59:01 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 22 Nov 2012 05:59:01 +0100
Subject: [Python-checkins] Daily reference leaks (966432a0734c): sum=0
Message-ID: <E1TbOsP-0007OX-7r@ap.vmr.nerim.net>

results for 966432a0734c on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Thu Nov 22 06:15:34 2012
From: python-checkins at python.org (eric.araujo)
Date: Thu, 22 Nov 2012 06:15:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Address_review?=
 =?utf-8?q?s_for_open=E2=80=99s_opener_argument_doc_patch_=28=2313424=29?=
 =?utf-8?q?=2E?=
Message-ID: <3Y6TPf5dJtzQ7y@mail.python.org>

http://hg.python.org/cpython/rev/bf1bf3bf3fe2
changeset:   80553:bf1bf3bf3fe2
branch:      3.3
parent:      80550:63a57de58ad9
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Nov 22 00:13:49 2012 -0500
summary:
  Address reviews for open?s opener argument doc patch (#13424).

* Remove example deemed not helpful.
* Simplify the other one.
* Add missing target to ref.

files:
  Doc/library/functions.rst |  26 ++++----------------------
  1 files changed, 4 insertions(+), 22 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -937,32 +937,14 @@
    :mod:`os.open` as *opener* results in functionality similar to passing
    ``None``).
 
-   The following example is an alternative implementation for opening files
-   for exclusive writing.  If we did not have support for the ``'x'`` mode,
-   we could implement it with this opener::
-
-      >>> import os
-      >>> def open_exclusive(path, mode):
-      ...     return os.open(path, mode | os.O_CREAT | os.O_EXCL)
-      ...
-      >>> filename = 'spam.txt'
-      >>> fp = open(filename, 'w', opener=open_exclusive)
-      >>> fp2 = open(filename, 'w', opener=open_exclusive)
-      Traceback (most recent call last):
-        ...
-      FileExistsError: [Errno 17] File exists: 'spam.txt'
-
-   This other example uses the :ref:`dir_fd` parameter of the
+   The following example uses the :ref:`dir_fd <dir_fd>` parameter of the
    :func:`os.open` function to open a file relative to a given directory::
 
       >>> import os
-      >>> def open_relative(dirname):
-      ...     dir_fd = os.open(dirname, os.O_RDONLY)
-      ...     def opener(path, flags):
-      ...         return os.open(path, flags, dir_fd=dir_fd)
-      ...     return opener, dir_fd
+      >>> dir_fd = os.open('somedir', os.O_RDONLY)
+      >>> def opener(path, flags):
+      ...     return os.open(path, flags, dir_fd=dir_fd)
       ...
-      >>> opener, dir_fd = open_relative('somedir')
       >>> with open('spamspam.txt', 'w', opener=opener) as f:
       ...     print('This will be written to somedir/spamspam.txt', file=f)
       ...

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

From python-checkins at python.org  Thu Nov 22 06:15:36 2012
From: python-checkins at python.org (eric.araujo)
Date: Thu, 22 Nov 2012 06:15:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2313424_followup_from_3=2E3?=
Message-ID: <3Y6TPh1C8yzQf4@mail.python.org>

http://hg.python.org/cpython/rev/8ca6f4953c4b
changeset:   80554:8ca6f4953c4b
parent:      80552:966432a0734c
parent:      80553:bf1bf3bf3fe2
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Nov 22 00:14:28 2012 -0500
summary:
  Merge #13424 followup from 3.3

files:
  Doc/library/functions.rst |  26 ++++----------------------
  1 files changed, 4 insertions(+), 22 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -937,32 +937,14 @@
    :mod:`os.open` as *opener* results in functionality similar to passing
    ``None``).
 
-   The following example is an alternative implementation for opening files
-   for exclusive writing.  If we did not have support for the ``'x'`` mode,
-   we could implement it with this opener::
-
-      >>> import os
-      >>> def open_exclusive(path, mode):
-      ...     return os.open(path, mode | os.O_CREAT | os.O_EXCL)
-      ...
-      >>> filename = 'spam.txt'
-      >>> fp = open(filename, 'w', opener=open_exclusive)
-      >>> fp2 = open(filename, 'w', opener=open_exclusive)
-      Traceback (most recent call last):
-        ...
-      FileExistsError: [Errno 17] File exists: 'spam.txt'
-
-   This other example uses the :ref:`dir_fd` parameter of the
+   The following example uses the :ref:`dir_fd <dir_fd>` parameter of the
    :func:`os.open` function to open a file relative to a given directory::
 
       >>> import os
-      >>> def open_relative(dirname):
-      ...     dir_fd = os.open(dirname, os.O_RDONLY)
-      ...     def opener(path, flags):
-      ...         return os.open(path, flags, dir_fd=dir_fd)
-      ...     return opener, dir_fd
+      >>> dir_fd = os.open('somedir', os.O_RDONLY)
+      >>> def opener(path, flags):
+      ...     return os.open(path, flags, dir_fd=dir_fd)
       ...
-      >>> opener, dir_fd = open_relative('somedir')
       >>> with open('spamspam.txt', 'w', opener=opener) as f:
       ...     print('This will be written to somedir/spamspam.txt', file=f)
       ...

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

From python-checkins at python.org  Thu Nov 22 12:22:58 2012
From: python-checkins at python.org (r.david.murray)
Date: Thu, 22 Nov 2012 12:22:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316522=3A_s/always_1/at_?=
	=?utf-8?q?most_1/=2E?=
Message-ID: <3Y6dYZ0ysrzQDD@mail.python.org>

http://hg.python.org/cpython/rev/e456da396ad9
changeset:   80555:e456da396ad9
user:        R David Murray <rdmurray at bitdance.com>
date:        Thu Nov 22 06:22:41 2012 -0500
summary:
  #16522: s/always 1/at most 1/.

Correction thanks to Joey Geralnik.

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


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -636,8 +636,8 @@
 .. data:: FAIL_FAST
 
    When specified, exit after the first failing example and don't attempt to run
-   the remaining examples. Thus, the number of failures reported will always be 1.
-   This flag may be useful during debugging, since examples after the first
+   the remaining examples. Thus, the number of failures reported will be at most
+   1.  This flag may be useful during debugging, since examples after the first
    failure won't even produce debugging output.
 
    .. versionadded:: 3.4

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

From python-checkins at python.org  Thu Nov 22 22:38:12 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 22 Nov 2012 22:38:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEzMDU3?=
 =?utf-8?q?=3A_Include_stdio=2Eh_when_NULL_is_used_in_configure=2Eac=2E?=
Message-ID: <3Y6vCS2GxPzMTJ@mail.python.org>

http://hg.python.org/cpython/rev/b4f6cd5f9ab7
changeset:   80556:b4f6cd5f9ab7
branch:      2.7
parent:      80545:081cef8554fe
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 22 22:36:57 2012 +0100
summary:
  Issue #13057: Include stdio.h when NULL is used in configure.ac.

files:
  configure    |  10 +++++++++-
  configure.ac |  12 ++++++++++--
  2 files changed, 19 insertions(+), 3 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5850,6 +5850,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -5905,6 +5906,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -5954,6 +5956,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6003,6 +6006,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -8690,6 +8694,8 @@
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
+#include <stdio.h>
 #include <pthread.h>
 
 void * start_routine (void *arg) { exit (0); }
@@ -9082,7 +9088,9 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <pthread.h>
+
+      #include <stdio.h>
+      #include <pthread.h>
       void *foo(void *parm) {
         return NULL;
       }
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1233,6 +1233,7 @@
 AC_MSG_CHECKING(whether pthreads are available without options)
 AC_CACHE_VAL(ac_cv_pthread_is_default,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1267,6 +1268,7 @@
 [ac_save_cc="$CC"
 CC="$CC -Kpthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1295,6 +1297,7 @@
 [ac_save_cc="$CC"
 CC="$CC -Kthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1323,6 +1326,7 @@
 [ac_save_cc="$CC"
 CC="$CC -pthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -2317,7 +2321,9 @@
     _libs=$LIBS
     LIBS="$LIBS -lpthread"
     AC_MSG_CHECKING([for pthread_create in -lpthread])
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <pthread.h>
 
 void * start_routine (void *arg) { exit (0); }]], [[
 pthread_create (NULL, NULL, start_routine, NULL)]])],[
@@ -2400,7 +2406,9 @@
 
       AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
       AC_CACHE_VAL(ac_cv_pthread_system_supported,
-      [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
+      [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+      #include <stdio.h>
+      #include <pthread.h>
       void *foo(void *parm) {
         return NULL;
       }

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

From python-checkins at python.org  Thu Nov 22 22:59:02 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 22 Nov 2012 22:59:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzEzMDU3?=
 =?utf-8?q?=3A_Include_stdio=2Eh_when_NULL_is_used_in_configure=2Eac=2E?=
Message-ID: <3Y6vgV1lKHzRR5@mail.python.org>

http://hg.python.org/cpython/rev/f0baa6be2bf1
changeset:   80557:f0baa6be2bf1
branch:      3.3
parent:      80553:bf1bf3bf3fe2
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 22 22:49:11 2012 +0100
summary:
  Issue #13057: Include stdio.h when NULL is used in configure.ac.

files:
  configure    |  10 +++++++++-
  configure.ac |  12 ++++++++++--
  2 files changed, 19 insertions(+), 3 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -6562,6 +6562,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6617,6 +6618,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6666,6 +6668,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6715,6 +6718,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -9323,6 +9327,8 @@
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
+#include <stdio.h>
 #include <pthread.h>
 
 void * start_routine (void *arg) { exit (0); }
@@ -9672,7 +9678,9 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <pthread.h>
+
+      #include <stdio.h>
+      #include <pthread.h>
       void *foo(void *parm) {
         return NULL;
       }
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1345,6 +1345,7 @@
 AC_MSG_CHECKING(whether pthreads are available without options)
 AC_CACHE_VAL(ac_cv_pthread_is_default,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1379,6 +1380,7 @@
 [ac_save_cc="$CC"
 CC="$CC -Kpthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1407,6 +1409,7 @@
 [ac_save_cc="$CC"
 CC="$CC -Kthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1435,6 +1438,7 @@
 [ac_save_cc="$CC"
 CC="$CC -pthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -2356,7 +2360,9 @@
     _libs=$LIBS
     LIBS="$LIBS -lpthread"
     AC_MSG_CHECKING([for pthread_create in -lpthread])
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <pthread.h>
 
 void * start_routine (void *arg) { exit (0); }]], [[
 pthread_create (NULL, NULL, start_routine, NULL)]])],[
@@ -2422,7 +2428,9 @@
 
       AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
       AC_CACHE_VAL(ac_cv_pthread_system_supported,
-      [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
+      [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+      #include <stdio.h>
+      #include <pthread.h>
       void *foo(void *parm) {
         return NULL;
       }

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

From python-checkins at python.org  Thu Nov 22 22:59:03 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 22 Nov 2012 22:59:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3Y6vgW49dZzRRl@mail.python.org>

http://hg.python.org/cpython/rev/d9f9abe7821e
changeset:   80558:d9f9abe7821e
parent:      80555:e456da396ad9
parent:      80557:f0baa6be2bf1
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 22 22:57:54 2012 +0100
summary:
  Merge 3.3.

files:
  configure    |  10 +++++++++-
  configure.ac |  12 ++++++++++--
  2 files changed, 19 insertions(+), 3 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -6562,6 +6562,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6617,6 +6618,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6666,6 +6668,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -6715,6 +6718,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -9323,6 +9327,8 @@
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
+#include <stdio.h>
 #include <pthread.h>
 
 void * start_routine (void *arg) { exit (0); }
@@ -9672,7 +9678,9 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <pthread.h>
+
+      #include <stdio.h>
+      #include <pthread.h>
       void *foo(void *parm) {
         return NULL;
       }
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1345,6 +1345,7 @@
 AC_MSG_CHECKING(whether pthreads are available without options)
 AC_CACHE_VAL(ac_cv_pthread_is_default,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1379,6 +1380,7 @@
 [ac_save_cc="$CC"
 CC="$CC -Kpthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1407,6 +1409,7 @@
 [ac_save_cc="$CC"
 CC="$CC -Kthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -1435,6 +1438,7 @@
 [ac_save_cc="$CC"
 CC="$CC -pthread"
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <pthread.h>
 
 void* routine(void* p){return NULL;}
@@ -2356,7 +2360,9 @@
     _libs=$LIBS
     LIBS="$LIBS -lpthread"
     AC_MSG_CHECKING([for pthread_create in -lpthread])
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <pthread.h>
 
 void * start_routine (void *arg) { exit (0); }]], [[
 pthread_create (NULL, NULL, start_routine, NULL)]])],[
@@ -2422,7 +2428,9 @@
 
       AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
       AC_CACHE_VAL(ac_cv_pthread_system_supported,
-      [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
+      [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+      #include <stdio.h>
+      #include <pthread.h>
       void *foo(void *parm) {
         return NULL;
       }

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

From python-checkins at python.org  Thu Nov 22 23:51:07 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 22 Nov 2012 23:51:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_more_usage?=
 =?utf-8?q?s_of_NULL_without_including_stdio=2Eh=2E?=
Message-ID: <3Y6wqb6RWdzMKb@mail.python.org>

http://hg.python.org/cpython/rev/7531dba22872
changeset:   80559:7531dba22872
branch:      3.3
parent:      80557:f0baa6be2bf1
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 22 23:47:32 2012 +0100
summary:
  Fix more usages of NULL without including stdio.h.

files:
  configure    |  2 ++
  configure.ac |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -11620,6 +11620,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -14833,6 +14834,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include<stdlib.h>
 int main() {
     size_t len = -1;
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3119,6 +3119,7 @@
   AC_MSG_CHECKING(getaddrinfo bug)
   AC_CACHE_VAL(ac_cv_buggy_getaddrinfo,
   AC_RUN_IFELSE([AC_LANG_SOURCE([[[
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -4447,6 +4448,7 @@
 AC_MSG_CHECKING(for broken mbstowcs)
 AC_CACHE_VAL(ac_cv_broken_mbstowcs,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include<stdlib.h>
 int main() {
     size_t len = -1;

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

From python-checkins at python.org  Thu Nov 22 23:51:09 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 22 Nov 2012 23:51:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3Y6wqd1mvdzRNG@mail.python.org>

http://hg.python.org/cpython/rev/fbca723b5485
changeset:   80560:fbca723b5485
parent:      80558:d9f9abe7821e
parent:      80559:7531dba22872
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 22 23:50:25 2012 +0100
summary:
  Merge 3.3.

files:
  configure    |  2 ++
  configure.ac |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -11620,6 +11620,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -14833,6 +14834,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include<stdlib.h>
 int main() {
     size_t len = -1;
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3119,6 +3119,7 @@
   AC_MSG_CHECKING(getaddrinfo bug)
   AC_CACHE_VAL(ac_cv_buggy_getaddrinfo,
   AC_RUN_IFELSE([AC_LANG_SOURCE([[[
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -4447,6 +4448,7 @@
 AC_MSG_CHECKING(for broken mbstowcs)
 AC_CACHE_VAL(ac_cv_broken_mbstowcs,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include<stdlib.h>
 int main() {
     size_t len = -1;

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

From python-checkins at python.org  Thu Nov 22 23:57:39 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 22 Nov 2012 23:57:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_more_usage?=
 =?utf-8?q?s_of_NULL_without_including_stdio=2Eh=2E?=
Message-ID: <3Y6wz74dbzzRTB@mail.python.org>

http://hg.python.org/cpython/rev/771f28686022
changeset:   80561:771f28686022
branch:      2.7
parent:      80556:b4f6cd5f9ab7
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 22 23:56:51 2012 +0100
summary:
  Fix more usages of NULL without including stdio.h.

files:
  configure    |  1 +
  configure.ac |  1 +
  2 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -10881,6 +10881,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3074,6 +3074,7 @@
   AC_MSG_CHECKING(getaddrinfo bug)
   AC_CACHE_VAL(ac_cv_buggy_getaddrinfo,
   AC_RUN_IFELSE([AC_LANG_SOURCE([[[
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>

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

From python-checkins at python.org  Fri Nov 23 00:51:36 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 00:51:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316309=3A_avoid_using_de?=
 =?utf-8?q?precated_method_and_turn_docstring_in_a_comment=2E?=
Message-ID: <3Y6y9N4ddRzRT4@mail.python.org>

http://hg.python.org/cpython/rev/803e5a732331
changeset:   80562:803e5a732331
parent:      80560:fbca723b5485
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 01:51:20 2012 +0200
summary:
  #16309: avoid using deprecated method and turn docstring in a comment.

files:
  Lib/test/test_cmd_line.py |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -218,11 +218,11 @@
         self.assertIn(path2.encode('ascii'), out)
 
     def test_empty_PYTHONPATH_issue16309(self):
-        """On Posix, it is documented that setting PATH to the
-        empty string is equivalent to not setting PATH at all,
-        which is an exception to the rule that in a string like
-        "/bin::/usr/bin" the empty string in the middle gets
-        interpreted as '.'"""
+        # On Posix, it is documented that setting PATH to the
+        # empty string is equivalent to not setting PATH at all,
+        # which is an exception to the rule that in a string like
+        # "/bin::/usr/bin" the empty string in the middle gets
+        # interpreted as '.'
         code = """if 1:
             import sys
             path = ":".join(sys.path)
@@ -232,7 +232,7 @@
         rc2, out2, err2 = assert_python_ok('-c', code)
         # regarding to Posix specification, outputs should be equal
         # for empty and unset PYTHONPATH
-        self.assertEquals(out1, out2)
+        self.assertEqual(out1, out2)
 
     def test_displayhook_unencodable(self):
         for encoding in ('ascii', 'latin-1', 'utf-8'):

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

From solipsis at pitrou.net  Fri Nov 23 05:59:15 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 23 Nov 2012 05:59:15 +0100
Subject: [Python-checkins] Daily reference leaks (803e5a732331): sum=0
Message-ID: <E1TblMB-0007He-9Y@ap.vmr.nerim.net>

results for 803e5a732331 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Fri Nov 23 14:29:59 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Fri, 23 Nov 2012 14:29:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NTM4?=
 =?utf-8?q?=3A_correctly_describe_MAKE=5FCLOSURE_in_docs=2E?=
Message-ID: <3Y7JKg64L7zQ7y@mail.python.org>

http://hg.python.org/cpython/rev/5d1e7912e23e
changeset:   80563:5d1e7912e23e
branch:      3.3
parent:      80559:7531dba22872
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri Nov 23 15:28:34 2012 +0200
summary:
  Issue #16538: correctly describe MAKE_CLOSURE in docs.

Patch by Daniel Urban

files:
  Doc/library/dis.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -763,9 +763,10 @@
 .. opcode:: MAKE_CLOSURE (argc)
 
    Creates a new function object, sets its *__closure__* slot, and pushes it on
-   the stack.  TOS is the code associated with the function, TOS1 the tuple
-   containing cells for the closure's free variables.  The function also has
-   *argc* default parameters, which are found below the cells.
+   the stack.  TOS is the :term:`qualified name` of the function, TOS1 is the
+   code associated with the function, and TOS2 is the tuple containing cells for
+   the closure's free variables.  The function also has *argc* default parameters,
+   which are found below the cells.
 
 
 .. opcode:: BUILD_SLICE (argc)

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

From python-checkins at python.org  Fri Nov 23 14:30:01 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Fri, 23 Nov 2012 14:30:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316538=3A_correctly_describe_MAKE=5FCLOSUR?=
 =?utf-8?q?E_in_docs=2E?=
Message-ID: <3Y7JKj1R99zQW5@mail.python.org>

http://hg.python.org/cpython/rev/8fff40a7c5b5
changeset:   80564:8fff40a7c5b5
parent:      80562:803e5a732331
parent:      80563:5d1e7912e23e
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri Nov 23 15:29:48 2012 +0200
summary:
  Merge issue #16538: correctly describe MAKE_CLOSURE in docs.

Patch by Daniel Urban

files:
  Doc/library/dis.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -763,9 +763,10 @@
 .. opcode:: MAKE_CLOSURE (argc)
 
    Creates a new function object, sets its *__closure__* slot, and pushes it on
-   the stack.  TOS is the code associated with the function, TOS1 the tuple
-   containing cells for the closure's free variables.  The function also has
-   *argc* default parameters, which are found below the cells.
+   the stack.  TOS is the :term:`qualified name` of the function, TOS1 is the
+   code associated with the function, and TOS2 is the tuple containing cells for
+   the closure's free variables.  The function also has *argc* default parameters,
+   which are found below the cells.
 
 
 .. opcode:: BUILD_SLICE (argc)

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

From python-checkins at python.org  Fri Nov 23 18:01:56 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:01:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzA2OiByZXBv?=
 =?utf-8?q?rt_only_the_first_unknown_option_and_add_more_tests=2E__Patch_b?=
 =?utf-8?q?y?=
Message-ID: <3Y7P2D6zkpzQT7@mail.python.org>

http://hg.python.org/cpython/rev/6a79e3beb854
changeset:   80565:6a79e3beb854
branch:      2.7
parent:      80561:771f28686022
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 18:46:11 2012 +0200
summary:
  #16306: report only the first unknown option and add more tests.  Patch by Serhiy Storchaka.

files:
  Lib/test/test_cmd_line.py |  20 +++++++++++++++-----
  Modules/main.c            |   1 +
  Python/getopt.c           |   2 +-
  3 files changed, 17 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -116,14 +116,24 @@
             print >>script, "del sys.modules['__main__']"
         assert_python_ok(filename)
 
-
     def test_unknown_options(self):
-        # Add "without='-E'" to prevent _assert_python append env_vars -E
-        # which changes the output of stderr
-        rc, out, err = assert_python_failure('-z', without='-E')
-        self.assertIn(b'Unknown option', err)
+        rc, out, err = assert_python_failure('-E', '-z')
+        self.assertIn(b'Unknown option: -z', err)
         self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
         self.assertEqual(b'', out)
+        # Add "without='-E'" to prevent _assert_python to append -E
+        # to env_vars and change the output of stderr
+        rc, out, err = assert_python_failure('-z', without='-E')
+        self.assertIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+        rc, out, err = assert_python_failure('-a', '-z', without='-E')
+        self.assertIn(b'Unknown option: -a', err)
+        # only the first unknown option is reported
+        self.assertNotIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1)
+        self.assertEqual(b'', out)
+
 
 def test_main():
     test.test_support.run_unittest(CmdLineTest)
diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -264,6 +264,7 @@
 
     /* Hash randomization needed early for all string operations
        (including -W and -X options). */
+    _PyOS_opterr = 0;  /* prevent printing the error in 1st pass */
     while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) {
         if (c == 'm' || c == 'c') {
             /* -c / -m is the last option: following arguments are
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -41,7 +41,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 0;   /* prevent printing the error in 2nd loop in main.c */
+    _PyOS_opterr = 1;
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = "";

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

From python-checkins at python.org  Fri Nov 23 18:01:58 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:01:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MzA2OiByZXBv?=
 =?utf-8?q?rt_only_the_first_unknown_option_and_add_more_tests=2E__Patch_b?=
 =?utf-8?q?y?=
Message-ID: <3Y7P2G3fbCzRHF@mail.python.org>

http://hg.python.org/cpython/rev/654a628f5f00
changeset:   80566:654a628f5f00
branch:      3.2
parent:      80549:305d2aa5c129
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 18:48:32 2012 +0200
summary:
  #16306: report only the first unknown option and add more tests.  Patch by Serhiy Storchaka.

files:
  Lib/test/test_cmd_line.py |  18 +++++++++++++++---
  Modules/main.c            |   1 +
  Python/getopt.c           |   2 +-
  3 files changed, 17 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -376,12 +376,24 @@
             print("del sys.modules['__main__']", file=script)
         assert_python_ok(filename)
 
-
     def test_unknown_options(self):
-        rc, out, err = assert_python_failure('-z', __cleanenv=True)
-        self.assertIn(b'Unknown option', err)
+        rc, out, err = assert_python_failure('-E', '-z')
+        self.assertIn(b'Unknown option: -z', err)
         self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
         self.assertEqual(b'', out)
+        # Add "without='-E'" to prevent _assert_python to append -E
+        # to env_vars and change the output of stderr
+        rc, out, err = assert_python_failure('-z', without='-E')
+        self.assertIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+        rc, out, err = assert_python_failure('-a', '-z', without='-E')
+        self.assertIn(b'Unknown option: -a', err)
+        # only the first unknown option is reported
+        self.assertNotIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1)
+        self.assertEqual(b'', out)
+
 
 def test_main():
     test.support.run_unittest(CmdLineTest)
diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -339,6 +339,7 @@
 
     /* Hash randomization needed early for all string operations
        (including -W and -X options). */
+    _PyOS_opterr = 0;  /* prevent printing the error in 1st pass */
     while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) {
         if (c == 'm' || c == 'c') {
             /* -c / -m is the last option: following arguments are
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
+    _PyOS_opterr = 1;
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";

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

From python-checkins at python.org  Fri Nov 23 18:01:59 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:01:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316306=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y7P2H5y5XzRL1@mail.python.org>

http://hg.python.org/cpython/rev/421a8a5ffbb2
changeset:   80567:421a8a5ffbb2
branch:      3.3
parent:      80563:5d1e7912e23e
parent:      80566:654a628f5f00
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 18:52:39 2012 +0200
summary:
  #16306: merge with 3.2.

files:
  Lib/test/test_cmd_line.py |  18 +++++++++++++++---
  Modules/main.c            |   1 +
  Python/getopt.c           |   2 +-
  3 files changed, 17 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -370,12 +370,24 @@
             print("del sys.modules['__main__']", file=script)
         assert_python_ok(filename)
 
-
     def test_unknown_options(self):
-        rc, out, err = assert_python_failure('-z', __cleanenv=True)
-        self.assertIn(b'Unknown option', err)
+        rc, out, err = assert_python_failure('-E', '-z')
+        self.assertIn(b'Unknown option: -z', err)
         self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
         self.assertEqual(b'', out)
+        # Add "without='-E'" to prevent _assert_python to append -E
+        # to env_vars and change the output of stderr
+        rc, out, err = assert_python_failure('-z', without='-E')
+        self.assertIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+        rc, out, err = assert_python_failure('-a', '-z', without='-E')
+        self.assertIn(b'Unknown option: -a', err)
+        # only the first unknown option is reported
+        self.assertNotIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1)
+        self.assertEqual(b'', out)
+
 
 def test_main():
     test.support.run_unittest(CmdLineTest)
diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -338,6 +338,7 @@
 
     /* Hash randomization needed early for all string operations
        (including -W and -X options). */
+    _PyOS_opterr = 0;  /* prevent printing the error in 1st pass */
     while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) {
         if (c == 'm' || c == 'c') {
             /* -c / -m is the last option: following arguments are
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
+    _PyOS_opterr = 1;
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";

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

From python-checkins at python.org  Fri Nov 23 18:02:01 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:02:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2MzA2OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y7P2K1vS5zRJJ@mail.python.org>

http://hg.python.org/cpython/rev/51caa0820fad
changeset:   80568:51caa0820fad
parent:      80564:8fff40a7c5b5
parent:      80567:421a8a5ffbb2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 19:01:42 2012 +0200
summary:
  #16306: merge with 3.3.

files:
  Lib/test/test_cmd_line.py |  18 +++++++++++++++---
  Modules/main.c            |   1 +
  Python/getopt.c           |   2 +-
  3 files changed, 17 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -387,12 +387,24 @@
             print("del sys.modules['__main__']", file=script)
         assert_python_ok(filename)
 
-
     def test_unknown_options(self):
-        rc, out, err = assert_python_failure('-z', __cleanenv=True)
-        self.assertIn(b'Unknown option', err)
+        rc, out, err = assert_python_failure('-E', '-z')
+        self.assertIn(b'Unknown option: -z', err)
         self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
         self.assertEqual(b'', out)
+        # Add "without='-E'" to prevent _assert_python to append -E
+        # to env_vars and change the output of stderr
+        rc, out, err = assert_python_failure('-z', without='-E')
+        self.assertIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
+        self.assertEqual(b'', out)
+        rc, out, err = assert_python_failure('-a', '-z', without='-E')
+        self.assertIn(b'Unknown option: -a', err)
+        # only the first unknown option is reported
+        self.assertNotIn(b'Unknown option: -z', err)
+        self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1)
+        self.assertEqual(b'', out)
+
 
 def test_main():
     test.support.run_unittest(CmdLineTest)
diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -334,6 +334,7 @@
 
     /* Hash randomization needed early for all string operations
        (including -W and -X options). */
+    _PyOS_opterr = 0;  /* prevent printing the error in 1st pass */
     while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) {
         if (c == 'm' || c == 'c') {
             /* -c / -m is the last option: following arguments are
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
+    _PyOS_opterr = 1;
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";

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

From python-checkins at python.org  Fri Nov 23 18:47:03 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:47:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NTMwOiB0aGUg?=
 =?utf-8?q?=22options=22_arg_of_os=2Ewait3_is_required=2E?=
Message-ID: <3Y7Q2H2dLtzRHt@mail.python.org>

http://hg.python.org/cpython/rev/a2038edb51cd
changeset:   80569:a2038edb51cd
branch:      2.7
parent:      80565:6a79e3beb854
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 19:45:52 2012 +0200
summary:
  #16530: the "options" arg of os.wait3 is required.

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2226,7 +2226,7 @@
    with :const:`P_NOWAIT` return suitable process handles.
 
 
-.. function:: wait3([options])
+.. function:: wait3(options)
 
    Similar to :func:`waitpid`, except no process id argument is given and a
    3-element tuple containing the child's process id, exit status indication, and

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

From python-checkins at python.org  Fri Nov 23 18:47:04 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:47:04 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NTMwOiB0aGUg?=
 =?utf-8?q?=22options=22_arg_of_os=2Ewait3_is_required=2E?=
Message-ID: <3Y7Q2J5Z4xzRLD@mail.python.org>

http://hg.python.org/cpython/rev/1cf1194a443e
changeset:   80570:1cf1194a443e
branch:      3.2
parent:      80566:654a628f5f00
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 19:45:52 2012 +0200
summary:
  #16530: the "options" arg of os.wait3 is required.

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2075,7 +2075,7 @@
    with :const:`P_NOWAIT` return suitable process handles.
 
 
-.. function:: wait3([options])
+.. function:: wait3(options)
 
    Similar to :func:`waitpid`, except no process id argument is given and a
    3-element tuple containing the child's process id, exit status indication, and

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

From python-checkins at python.org  Fri Nov 23 18:47:06 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:47:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316530=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y7Q2L0pzyzRNL@mail.python.org>

http://hg.python.org/cpython/rev/7359ade2ab0b
changeset:   80571:7359ade2ab0b
branch:      3.3
parent:      80567:421a8a5ffbb2
parent:      80570:1cf1194a443e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 19:46:29 2012 +0200
summary:
  #16530: merge with 3.2.

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2925,7 +2925,7 @@
    with :const:`P_NOWAIT` return suitable process handles.
 
 
-.. function:: wait3([options])
+.. function:: wait3(options)
 
    Similar to :func:`waitpid`, except no process id argument is given and a
    3-element tuple containing the child's process id, exit status indication, and

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

From python-checkins at python.org  Fri Nov 23 18:47:07 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 18:47:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NTMwOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y7Q2M3JhKzRPJ@mail.python.org>

http://hg.python.org/cpython/rev/a728056347ec
changeset:   80572:a728056347ec
parent:      80568:51caa0820fad
parent:      80571:7359ade2ab0b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 19:46:52 2012 +0200
summary:
  #16530: merge with 3.3.

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2925,7 +2925,7 @@
    with :const:`P_NOWAIT` return suitable process handles.
 
 
-.. function:: wait3([options])
+.. function:: wait3(options)
 
    Similar to :func:`waitpid`, except no process id argument is given and a
    3-element tuple containing the child's process id, exit status indication, and

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

From python-checkins at python.org  Fri Nov 23 19:38:38 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 23 Nov 2012 19:38:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Clarify_that_only_the_lat?=
 =?utf-8?q?est_maintenance_branches_are_rebuilt_=28issue_=2316528=29=2E?=
Message-ID: <3Y7R9p4fxPzRLG@mail.python.org>

http://hg.python.org/devguide/rev/31bb42754962
changeset:   574:31bb42754962
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 23 10:38:06 2012 -0800
summary:
  Clarify that only the latest maintenance branches are rebuilt (issue #16528).

files:
  devcycle.rst   |   9 ++++++---
  docquality.rst |  13 +++++++------
  2 files changed, 13 insertions(+), 9 deletions(-)


diff --git a/devcycle.rst b/devcycle.rst
--- a/devcycle.rst
+++ b/devcycle.rst
@@ -65,7 +65,8 @@
 --------------------
 
 A branch for a previous feature release, currently being maintained for bug
-fixes.  There are currently two of them in activity: one for Python 3.x and
+fixes.  There are usually two maintenance branches at any given time: one for
+Python 3.x and
 one for Python 2.x.  At some point in the future, Python 2.x will be closed
 for bug fixes and there will be only one maintenance branch left.
 
@@ -75,8 +76,8 @@
 etc.).  For both rules, only rare exceptions are accepted and **must** be
 discussed first.
 
-When a new maintenance branch is created (after a new *minor version* is
-released), the old maintenance branch on that major version (e.g. 3.2.x
+Sometime after a new maintenance branch is created (after a new *minor version*
+is released), the old maintenance branch on that major version (e.g. 3.2.x
 after 3.3 gets released) will go into :ref:`security mode <secbranch>`,
 usually after one last maintenance release at the discretion of the
 release manager.
@@ -96,6 +97,8 @@
 actual security patches have been applied to the branch.
 
 
+.. _listbranch:
+
 Summary
 -------
 
diff --git a/docquality.rst b/docquality.rst
--- a/docquality.rst
+++ b/docquality.rst
@@ -10,13 +10,14 @@
 
 :ref:`Documenting Python <documenting>` covers the details of how Python's documentation works.
 It includes an explanation of the markup used (although you can figure a lot
-out simply by looking at pre-existing documentation) and how to build the
-documentation (which allows you to see how your changes will look along with
-validating that your new markup is correct).
+out simply by looking at pre-existing documentation) and :ref:`how to build
+<building-doc>` the documentation (which allows you to see how your changes
+will look along with validating that your new markup is correct).
 
-The current in-development version of the documentation can be viewed at
-http://docs.python.org/dev/. This version is regenerated from source once
-a day.
+The documentation built from the :ref:`in-development <indevbranch>` and
+:ref:`maintenance <maintbranch>` branches can be viewed from
+http://docs.python.org/dev/.  The in-development and most recent 2.x and 3.x
+maintenance :ref:`branches <listbranch>` are rebuilt once per day.
 
 If you would like a technical documentation style guide, the `Apple
 Publications Style Guide

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

From python-checkins at python.org  Fri Nov 23 20:15:07 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 23 Nov 2012 20:15:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=234473=3A_Ensure_th?=
 =?utf-8?q?e_socket_is_shutdown_cleanly_in_POP3=2Eclose=28=29=2E?=
Message-ID: <3Y7Rzv3HgyzNGF@mail.python.org>

http://hg.python.org/cpython/rev/79e33578dc05
changeset:   80573:79e33578dc05
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Nov 23 20:04:45 2012 +0100
summary:
  Issue #4473: Ensure the socket is shutdown cleanly in POP3.close().
Patch by Lorenzo Catucci.

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


diff --git a/Lib/poplib.py b/Lib/poplib.py
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -259,7 +259,14 @@
         if self.file is not None:
             self.file.close()
         if self.sock is not None:
-            self.sock.close()
+            try:
+                self.sock.shutdown(socket.SHUT_RDWR)
+            except socket.error as e:
+                # The server might already have closed the connection
+                if e.errno != errno.ENOTCONN:
+                    raise
+            finally:
+                self.sock.close()
         self.file = self.sock = None
 
     #__del__ = quit
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,9 @@
 Library
 -------
 
+- Issue #4473: Ensure the socket is shutdown cleanly in POP3.close().
+  Patch by Lorenzo Catucci.
+
 - Issue #16522: added FAIL_FAST flag to doctest.
 
 - Issue #15627: Add the importlib.abc.SourceLoader.compile_source() method.

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

From python-checkins at python.org  Fri Nov 23 20:15:08 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 23 Nov 2012 20:15:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=234473=3A_Add_a_POP?=
 =?utf-8?q?3=2Ecapa=28=29_method_to_query_the_capabilities_advertised_by?=
Message-ID: <3Y7Rzw6qkXzNP4@mail.python.org>

http://hg.python.org/cpython/rev/d30fd9834cec
changeset:   80574:d30fd9834cec
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Nov 23 20:07:39 2012 +0100
summary:
  Issue #4473: Add a POP3.capa() method to query the capabilities advertised by the POP3 server.
Patch by Lorenzo Catucci.

files:
  Doc/library/poplib.rst  |   8 +++++++
  Lib/poplib.py           |  30 +++++++++++++++++++++++++++++
  Lib/test/test_poplib.py |  16 +++++++++++++++
  Misc/NEWS               |   3 ++
  4 files changed, 57 insertions(+), 0 deletions(-)


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -97,6 +97,14 @@
    Returns the greeting string sent by the POP3 server.
 
 
+.. method:: POP3.capa()
+
+   Query the server's capabilities as specified in :rfc:`2449`.
+   Returns a dictionary in the form ``{'name': ['param'...]}``.
+
+   .. versionadded:: 3.4
+
+
 .. method:: POP3.user(username)
 
    Send user command, response should indicate that a password is required.
diff --git a/Lib/poplib.py b/Lib/poplib.py
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -55,6 +55,7 @@
             APOP name digest        apop(name, digest)
             TOP msg n               top(msg, n)
             UIDL [msg]              uidl(msg = None)
+            CAPA                    capa()
 
     Raises one exception: 'error_proto'.
 
@@ -322,6 +323,35 @@
             return self._shortcmd('UIDL %s' % which)
         return self._longcmd('UIDL')
 
+
+    def capa(self):
+        """Return server capabilities (RFC 2449) as a dictionary
+        >>> c=poplib.POP3('localhost')
+        >>> c.capa()
+        {'IMPLEMENTATION': ['Cyrus', 'POP3', 'server', 'v2.2.12'],
+         'TOP': [], 'LOGIN-DELAY': ['0'], 'AUTH-RESP-CODE': [],
+         'EXPIRE': ['NEVER'], 'USER': [], 'STLS': [], 'PIPELINING': [],
+         'UIDL': [], 'RESP-CODES': []}
+        >>>
+
+        Really, according to RFC 2449, the cyrus folks should avoid
+        having the implementation splitted into multiple arguments...
+        """
+        def _parsecap(line):
+            lst = line.decode('ascii').split()
+            return lst[0], lst[1:]
+
+        caps = {}
+        try:
+            resp = self._longcmd('CAPA')
+            rawcaps = resp[1]
+            for capline in rawcaps:
+                capnm, capargs = _parsecap(capline)
+                caps[capnm] = capargs
+        except error_proto as _err:
+            raise error_proto('-ERR CAPA not supported by server')
+        return caps
+
 try:
     import ssl
 except ImportError:
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -33,6 +33,8 @@
 
 class DummyPOP3Handler(asynchat.async_chat):
 
+    CAPAS = {'UIDL': [], 'IMPLEMENTATION': ['python-testlib-pop-server']}
+
     def __init__(self, conn):
         asynchat.async_chat.__init__(self, conn)
         self.set_terminator(b"\r\n")
@@ -112,6 +114,16 @@
         self.push('+OK closing.')
         self.close_when_done()
 
+    def cmd_capa(self, arg):
+        self.push('+OK Capability list follows')
+        if self.CAPAS:
+            for cap, params in self.CAPAS.items():
+                _ln = [cap]
+                if params:
+                    _ln.extend(params)
+                self.push(' '.join(_ln))
+        self.push('.')
+
 
 class DummyPOP3Server(asyncore.dispatcher, threading.Thread):
 
@@ -232,6 +244,10 @@
         self.client.uidl()
         self.client.uidl('foo')
 
+    def test_capa(self):
+        capa = self.client.capa()
+        self.assertTrue('IMPLEMENTATION' in capa.keys())
+
     def test_quit(self):
         resp = self.client.quit()
         self.assertTrue(resp)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,9 @@
 Library
 -------
 
+- Issue #4473: Add a POP3.capa() method to query the capabilities advertised
+  by the POP3 server.  Patch by Lorenzo Catucci.
+
 - Issue #4473: Ensure the socket is shutdown cleanly in POP3.close().
   Patch by Lorenzo Catucci.
 

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

From python-checkins at python.org  Fri Nov 23 20:15:10 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 23 Nov 2012 20:15:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=234473=3A_Add_a_POP?=
 =?utf-8?q?3=2Estls=28=29_to_switch_a_clear-text_POP3_session_into_an?=
Message-ID: <3Y7Rzy3G2czPhk@mail.python.org>

http://hg.python.org/cpython/rev/2329f9198d7f
changeset:   80575:2329f9198d7f
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Nov 23 20:13:48 2012 +0100
summary:
  Issue #4473: Add a POP3.stls() to switch a clear-text POP3 session into an encrypted POP3 session, on supported servers.
Patch by Lorenzo Catucci.

files:
  Doc/library/poplib.rst  |   19 +++-
  Lib/poplib.py           |   48 ++++++++-
  Lib/test/test_poplib.py |  145 ++++++++++++++++++++++-----
  Misc/NEWS               |    3 +
  4 files changed, 176 insertions(+), 39 deletions(-)


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -13,8 +13,11 @@
 --------------
 
 This module defines a class, :class:`POP3`, which encapsulates a connection to a
-POP3 server and implements the protocol as defined in :rfc:`1725`.  The
-:class:`POP3` class supports both the minimal and optional command sets.
+POP3 server and implements the protocol as defined in :rfc:`1939`. The
+:class:`POP3` class supports both the minimal and optional command sets from
+:rfc:`1939`. The :class:`POP3` class also supports the `STLS` command introduced
+in :rfc:`2595` to enable encrypted communication on an already established connection.
+
 Additionally, this module provides a class :class:`POP3_SSL`, which provides
 support for connecting to POP3 servers that use SSL as an underlying protocol
 layer.
@@ -184,6 +187,18 @@
    the unique id for that message in the form ``'response mesgnum uid``, otherwise
    result is list ``(response, ['mesgnum uid', ...], octets)``.
 
+.. method:: POP3.stls(context=None)
+
+   Start a TLS session on the active connection as specified in :rfc:`2595`.
+   This is only allowed before user authentication
+
+   *context* parameter is a :class:`ssl.SSLContext` object which allows
+   bundling SSL configuration options, certificates and private keys into
+   a single (potentially long-lived) structure.
+
+   .. versionadded:: 3.4
+
+
 Instances of :class:`POP3_SSL` have no additional methods. The interface of this
 subclass is identical to its parent.
 
diff --git a/Lib/poplib.py b/Lib/poplib.py
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -15,6 +15,12 @@
 
 import re, socket
 
+try:
+    import ssl
+    HAVE_SSL = True
+except ImportError:
+    HAVE_SSL = False
+
 __all__ = ["POP3","error_proto"]
 
 # Exception raised when an error or invalid response is received:
@@ -56,6 +62,7 @@
             TOP msg n               top(msg, n)
             UIDL [msg]              uidl(msg = None)
             CAPA                    capa()
+            STLS                    stls()
 
     Raises one exception: 'error_proto'.
 
@@ -82,6 +89,7 @@
                  timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
         self.host = host
         self.port = port
+        self._tls_established = False
         self.sock = self._create_socket(timeout)
         self.file = self.sock.makefile('rb')
         self._debugging = 0
@@ -352,21 +360,42 @@
             raise error_proto('-ERR CAPA not supported by server')
         return caps
 
-try:
-    import ssl
-except ImportError:
-    pass
-else:
+
+    def stls(self, context=None):
+        """Start a TLS session on the active connection as specified in RFC 2595.
+
+                context - a ssl.SSLContext
+        """
+        if not HAVE_SSL:
+            raise error_proto('-ERR TLS support missing')
+        if self._tls_established:
+            raise error_proto('-ERR TLS session already established')
+        caps = self.capa()
+        if not 'STLS' in caps:
+            raise error_proto('-ERR STLS not supported by server')
+        if context is None:
+            context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+            context.options |= ssl.OP_NO_SSLv2
+        resp = self._shortcmd('STLS')
+        self.sock = context.wrap_socket(self.sock)
+        self.file = self.sock.makefile('rb')
+        self._tls_established = True
+        return resp
+
+
+if HAVE_SSL:
 
     class POP3_SSL(POP3):
         """POP3 client class over SSL connection
 
-        Instantiate with: POP3_SSL(hostname, port=995, keyfile=None, certfile=None)
+        Instantiate with: POP3_SSL(hostname, port=995, keyfile=None, certfile=None,
+                                   context=None)
 
                hostname - the hostname of the pop3 over ssl server
                port - port number
                keyfile - PEM formatted file that countains your private key
                certfile - PEM formatted certificate chain file
+               context - a ssl.SSLContext
 
         See the methods of the parent class POP3 for more documentation.
         """
@@ -392,6 +421,13 @@
                 sock = ssl.wrap_socket(sock, self.keyfile, self.certfile)
             return sock
 
+        def stls(self, keyfile=None, certfile=None, context=None):
+            """The method unconditionally raises an exception since the
+            STLS command doesn't make any sense on an already established
+            SSL/TLS session.
+            """
+            raise error_proto('-ERR TLS session already established')
+
     __all__.append("POP3_SSL")
 
 if __name__ == "__main__":
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -18,6 +18,13 @@
 HOST = test_support.HOST
 PORT = 0
 
+SUPPORTS_SSL = False
+if hasattr(poplib, 'POP3_SSL'):
+    import ssl
+
+    SUPPORTS_SSL = True
+    CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert.pem")
+
 # the dummy data returned by server when LIST and RETR commands are issued
 LIST_RESP = b'1 1\r\n2 2\r\n3 3\r\n4 4\r\n5 5\r\n.\r\n'
 RETR_RESP = b"""From: postmaster at python.org\
@@ -40,6 +47,8 @@
         self.set_terminator(b"\r\n")
         self.in_buffer = []
         self.push('+OK dummy pop3 server ready. <timestamp>')
+        self.tls_active = False
+        self.tls_starting = False
 
     def collect_incoming_data(self, data):
         self.in_buffer.append(data)
@@ -114,16 +123,65 @@
         self.push('+OK closing.')
         self.close_when_done()
 
+    def _get_capas(self):
+        _capas = dict(self.CAPAS)
+        if not self.tls_active and SUPPORTS_SSL:
+            _capas['STLS'] = []
+        return _capas
+
     def cmd_capa(self, arg):
         self.push('+OK Capability list follows')
-        if self.CAPAS:
-            for cap, params in self.CAPAS.items():
+        if self._get_capas():
+            for cap, params in self._get_capas().items():
                 _ln = [cap]
                 if params:
                     _ln.extend(params)
                 self.push(' '.join(_ln))
         self.push('.')
 
+    if SUPPORTS_SSL:
+
+        def cmd_stls(self, arg):
+            if self.tls_active is False:
+                self.push('+OK Begin TLS negotiation')
+                tls_sock = ssl.wrap_socket(self.socket, certfile=CERTFILE,
+                                           server_side=True,
+                                           do_handshake_on_connect=False,
+                                           suppress_ragged_eofs=False)
+                self.del_channel()
+                self.set_socket(tls_sock)
+                self.tls_active = True
+                self.tls_starting = True
+                self.in_buffer = []
+                self._do_tls_handshake()
+            else:
+                self.push('-ERR Command not permitted when TLS active')
+
+        def _do_tls_handshake(self):
+            try:
+                self.socket.do_handshake()
+            except ssl.SSLError as err:
+                if err.args[0] in (ssl.SSL_ERROR_WANT_READ,
+                                   ssl.SSL_ERROR_WANT_WRITE):
+                    return
+                elif err.args[0] == ssl.SSL_ERROR_EOF:
+                    return self.handle_close()
+                raise
+            except socket.error as err:
+                if err.args[0] == errno.ECONNABORTED:
+                    return self.handle_close()
+            else:
+                self.tls_active = True
+                self.tls_starting = False
+
+        def handle_read(self):
+            if self.tls_starting:
+                self._do_tls_handshake()
+            else:
+                try:
+                    asynchat.async_chat.handle_read(self)
+                except ssl.SSLEOFError:
+                    self.handle_close()
 
 class DummyPOP3Server(asyncore.dispatcher, threading.Thread):
 
@@ -254,13 +312,25 @@
         self.assertIsNone(self.client.sock)
         self.assertIsNone(self.client.file)
 
+    if SUPPORTS_SSL:
 
-SUPPORTS_SSL = False
-if hasattr(poplib, 'POP3_SSL'):
-    import ssl
+        def test_stls_capa(self):
+            capa = self.client.capa()
+            self.assertTrue('STLS' in capa.keys())
 
-    SUPPORTS_SSL = True
-    CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert.pem")
+        def test_stls(self):
+            expected = b'+OK Begin TLS negotiation'
+            resp = self.client.stls()
+            self.assertEqual(resp, expected)
+
+        def test_stls_context(self):
+            expected = b'+OK Begin TLS negotiation'
+            ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+            resp = self.client.stls(context=ctx)
+            self.assertEqual(resp, expected)
+
+
+if SUPPORTS_SSL:
 
     class DummyPOP3_SSLHandler(DummyPOP3Handler):
 
@@ -272,34 +342,13 @@
             self.del_channel()
             self.set_socket(ssl_socket)
             # Must try handshake before calling push()
-            self._ssl_accepting = True
-            self._do_ssl_handshake()
+            self.tls_active = True
+            self.tls_starting = True
+            self._do_tls_handshake()
             self.set_terminator(b"\r\n")
             self.in_buffer = []
             self.push('+OK dummy pop3 server ready. <timestamp>')
 
-        def _do_ssl_handshake(self):
-            try:
-                self.socket.do_handshake()
-            except ssl.SSLError as err:
-                if err.args[0] in (ssl.SSL_ERROR_WANT_READ,
-                                   ssl.SSL_ERROR_WANT_WRITE):
-                    return
-                elif err.args[0] == ssl.SSL_ERROR_EOF:
-                    return self.handle_close()
-                raise
-            except socket.error as err:
-                if err.args[0] == errno.ECONNABORTED:
-                    return self.handle_close()
-            else:
-                self._ssl_accepting = False
-
-        def handle_read(self):
-            if self._ssl_accepting:
-                self._do_ssl_handshake()
-            else:
-                DummyPOP3Handler.handle_read(self)
-
 
     class TestPOP3_SSLClass(TestPOP3Class):
         # repeat previous tests by using poplib.POP3_SSL
@@ -330,6 +379,39 @@
             self.assertIs(self.client.sock.context, ctx)
             self.assertTrue(self.client.noop().startswith(b'+OK'))
 
+        def test_stls(self):
+            self.assertRaises(poplib.error_proto, self.client.stls)
+
+        test_stls_context = test_stls
+
+        def test_stls_capa(self):
+            capa = self.client.capa()
+            self.assertFalse('STLS' in capa.keys())
+
+
+    class TestPOP3_TLSClass(TestPOP3Class):
+        # repeat previous tests by using poplib.POP3.stls()
+
+        def setUp(self):
+            self.server = DummyPOP3Server((HOST, PORT))
+            self.server.start()
+            self.client = poplib.POP3(self.server.host, self.server.port, timeout=3)
+            self.client.stls()
+
+        def tearDown(self):
+            if self.client.file is not None and self.client.sock is not None:
+                self.client.quit()
+            self.server.stop()
+
+        def test_stls(self):
+            self.assertRaises(poplib.error_proto, self.client.stls)
+
+        test_stls_context = test_stls
+
+        def test_stls_capa(self):
+            capa = self.client.capa()
+            self.assertFalse(b'STLS' in capa.keys())
+
 
 class TestTimeouts(TestCase):
 
@@ -389,6 +471,7 @@
     tests = [TestPOP3Class, TestTimeouts]
     if SUPPORTS_SSL:
         tests.append(TestPOP3_SSLClass)
+        tests.append(TestPOP3_TLSClass)
     thread_info = test_support.threading_setup()
     try:
         test_support.run_unittest(*tests)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,9 @@
 Library
 -------
 
+- Issue #4473: Add a POP3.stls() to switch a clear-text POP3 session into
+  an encrypted POP3 session, on supported servers.  Patch by Lorenzo Catucci.
+
 - Issue #4473: Add a POP3.capa() method to query the capabilities advertised
   by the POP3 server.  Patch by Lorenzo Catucci.
 

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

From python-checkins at python.org  Fri Nov 23 20:22:50 2012
From: python-checkins at python.org (vinay.sajip)
Date: Fri, 23 Nov 2012 20:22:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NTE5?=
 =?utf-8?q?=3A_Used_os=2Epath=2Eabspath=2C_removed_unnecessary_code_for?=
Message-ID: <3Y7S8p2g9NzPyg@mail.python.org>

http://hg.python.org/cpython/rev/fe2200c1c2d3
changeset:   80576:fe2200c1c2d3
branch:      3.3
parent:      80571:7359ade2ab0b
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Nov 23 19:16:49 2012 +0000
summary:
  Issue #16519: Used os.path.abspath, removed unnecessary code for executable_name.

files:
  Lib/site.py |  8 +++-----
  1 files changed, 3 insertions(+), 5 deletions(-)


diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -503,15 +503,13 @@
         executable = os.environ['__PYVENV_LAUNCHER__']
     else:
         executable = sys.executable
-    executable_dir, executable_name = os.path.split(executable)
-    site_prefix = os.path.dirname(executable_dir)
+    exe_dir, _ = os.path.split(os.path.abspath(executable))
+    site_prefix = os.path.dirname(exe_dir)
     sys._home = None
-    if sys.platform == 'win32':
-        executable_name = os.path.splitext(executable_name)[0]
     conf_basename = 'pyvenv.cfg'
     candidate_confs = [
         conffile for conffile in (
-            os.path.join(executable_dir, conf_basename),
+            os.path.join(exe_dir, conf_basename),
             os.path.join(site_prefix, conf_basename)
             )
         if os.path.isfile(conffile)

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

From python-checkins at python.org  Fri Nov 23 20:22:51 2012
From: python-checkins at python.org (vinay.sajip)
Date: Fri, 23 Nov 2012 20:22:51 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Closes_=2316519=3A_Merged_fix_from_3=2E3=2E?=
Message-ID: <3Y7S8q500yzQ63@mail.python.org>

http://hg.python.org/cpython/rev/a874c4a6ad5f
changeset:   80577:a874c4a6ad5f
parent:      80572:a728056347ec
parent:      80576:fe2200c1c2d3
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Nov 23 19:21:46 2012 +0000
summary:
  Closes #16519: Merged fix from 3.3.

files:
  Lib/site.py |  8 +++-----
  1 files changed, 3 insertions(+), 5 deletions(-)


diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -484,15 +484,13 @@
         executable = os.environ['__PYVENV_LAUNCHER__']
     else:
         executable = sys.executable
-    executable_dir, executable_name = os.path.split(executable)
-    site_prefix = os.path.dirname(executable_dir)
+    exe_dir, _ = os.path.split(os.path.abspath(executable))
+    site_prefix = os.path.dirname(exe_dir)
     sys._home = None
-    if sys.platform == 'win32':
-        executable_name = os.path.splitext(executable_name)[0]
     conf_basename = 'pyvenv.cfg'
     candidate_confs = [
         conffile for conffile in (
-            os.path.join(executable_dir, conf_basename),
+            os.path.join(exe_dir, conf_basename),
             os.path.join(site_prefix, conf_basename)
             )
         if os.path.isfile(conffile)

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

From python-checkins at python.org  Fri Nov 23 20:22:53 2012
From: python-checkins at python.org (vinay.sajip)
Date: Fri, 23 Nov 2012 20:22:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
 =?utf-8?q?=29=3A_Merged_upstream_changes=2E?=
Message-ID: <3Y7S8s1SsJzQFC@mail.python.org>

http://hg.python.org/cpython/rev/aa4cfd84d449
changeset:   80578:aa4cfd84d449
parent:      80577:a874c4a6ad5f
parent:      80575:2329f9198d7f
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Nov 23 19:22:39 2012 +0000
summary:
  Merged upstream changes.

files:
  Doc/library/poplib.rst  |   27 ++++-
  Lib/poplib.py           |   87 ++++++++++++++-
  Lib/test/test_poplib.py |  157 ++++++++++++++++++++++-----
  Misc/NEWS               |    9 +
  4 files changed, 242 insertions(+), 38 deletions(-)


diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -13,8 +13,11 @@
 --------------
 
 This module defines a class, :class:`POP3`, which encapsulates a connection to a
-POP3 server and implements the protocol as defined in :rfc:`1725`.  The
-:class:`POP3` class supports both the minimal and optional command sets.
+POP3 server and implements the protocol as defined in :rfc:`1939`. The
+:class:`POP3` class supports both the minimal and optional command sets from
+:rfc:`1939`. The :class:`POP3` class also supports the `STLS` command introduced
+in :rfc:`2595` to enable encrypted communication on an already established connection.
+
 Additionally, this module provides a class :class:`POP3_SSL`, which provides
 support for connecting to POP3 servers that use SSL as an underlying protocol
 layer.
@@ -97,6 +100,14 @@
    Returns the greeting string sent by the POP3 server.
 
 
+.. method:: POP3.capa()
+
+   Query the server's capabilities as specified in :rfc:`2449`.
+   Returns a dictionary in the form ``{'name': ['param'...]}``.
+
+   .. versionadded:: 3.4
+
+
 .. method:: POP3.user(username)
 
    Send user command, response should indicate that a password is required.
@@ -176,6 +187,18 @@
    the unique id for that message in the form ``'response mesgnum uid``, otherwise
    result is list ``(response, ['mesgnum uid', ...], octets)``.
 
+.. method:: POP3.stls(context=None)
+
+   Start a TLS session on the active connection as specified in :rfc:`2595`.
+   This is only allowed before user authentication
+
+   *context* parameter is a :class:`ssl.SSLContext` object which allows
+   bundling SSL configuration options, certificates and private keys into
+   a single (potentially long-lived) structure.
+
+   .. versionadded:: 3.4
+
+
 Instances of :class:`POP3_SSL` have no additional methods. The interface of this
 subclass is identical to its parent.
 
diff --git a/Lib/poplib.py b/Lib/poplib.py
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -15,6 +15,12 @@
 
 import re, socket
 
+try:
+    import ssl
+    HAVE_SSL = True
+except ImportError:
+    HAVE_SSL = False
+
 __all__ = ["POP3","error_proto"]
 
 # Exception raised when an error or invalid response is received:
@@ -55,6 +61,8 @@
             APOP name digest        apop(name, digest)
             TOP msg n               top(msg, n)
             UIDL [msg]              uidl(msg = None)
+            CAPA                    capa()
+            STLS                    stls()
 
     Raises one exception: 'error_proto'.
 
@@ -81,6 +89,7 @@
                  timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
         self.host = host
         self.port = port
+        self._tls_established = False
         self.sock = self._create_socket(timeout)
         self.file = self.sock.makefile('rb')
         self._debugging = 0
@@ -259,7 +268,14 @@
         if self.file is not None:
             self.file.close()
         if self.sock is not None:
-            self.sock.close()
+            try:
+                self.sock.shutdown(socket.SHUT_RDWR)
+            except socket.error as e:
+                # The server might already have closed the connection
+                if e.errno != errno.ENOTCONN:
+                    raise
+            finally:
+                self.sock.close()
         self.file = self.sock = None
 
     #__del__ = quit
@@ -315,21 +331,71 @@
             return self._shortcmd('UIDL %s' % which)
         return self._longcmd('UIDL')
 
-try:
-    import ssl
-except ImportError:
-    pass
-else:
+
+    def capa(self):
+        """Return server capabilities (RFC 2449) as a dictionary
+        >>> c=poplib.POP3('localhost')
+        >>> c.capa()
+        {'IMPLEMENTATION': ['Cyrus', 'POP3', 'server', 'v2.2.12'],
+         'TOP': [], 'LOGIN-DELAY': ['0'], 'AUTH-RESP-CODE': [],
+         'EXPIRE': ['NEVER'], 'USER': [], 'STLS': [], 'PIPELINING': [],
+         'UIDL': [], 'RESP-CODES': []}
+        >>>
+
+        Really, according to RFC 2449, the cyrus folks should avoid
+        having the implementation splitted into multiple arguments...
+        """
+        def _parsecap(line):
+            lst = line.decode('ascii').split()
+            return lst[0], lst[1:]
+
+        caps = {}
+        try:
+            resp = self._longcmd('CAPA')
+            rawcaps = resp[1]
+            for capline in rawcaps:
+                capnm, capargs = _parsecap(capline)
+                caps[capnm] = capargs
+        except error_proto as _err:
+            raise error_proto('-ERR CAPA not supported by server')
+        return caps
+
+
+    def stls(self, context=None):
+        """Start a TLS session on the active connection as specified in RFC 2595.
+
+                context - a ssl.SSLContext
+        """
+        if not HAVE_SSL:
+            raise error_proto('-ERR TLS support missing')
+        if self._tls_established:
+            raise error_proto('-ERR TLS session already established')
+        caps = self.capa()
+        if not 'STLS' in caps:
+            raise error_proto('-ERR STLS not supported by server')
+        if context is None:
+            context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+            context.options |= ssl.OP_NO_SSLv2
+        resp = self._shortcmd('STLS')
+        self.sock = context.wrap_socket(self.sock)
+        self.file = self.sock.makefile('rb')
+        self._tls_established = True
+        return resp
+
+
+if HAVE_SSL:
 
     class POP3_SSL(POP3):
         """POP3 client class over SSL connection
 
-        Instantiate with: POP3_SSL(hostname, port=995, keyfile=None, certfile=None)
+        Instantiate with: POP3_SSL(hostname, port=995, keyfile=None, certfile=None,
+                                   context=None)
 
                hostname - the hostname of the pop3 over ssl server
                port - port number
                keyfile - PEM formatted file that countains your private key
                certfile - PEM formatted certificate chain file
+               context - a ssl.SSLContext
 
         See the methods of the parent class POP3 for more documentation.
         """
@@ -355,6 +421,13 @@
                 sock = ssl.wrap_socket(sock, self.keyfile, self.certfile)
             return sock
 
+        def stls(self, keyfile=None, certfile=None, context=None):
+            """The method unconditionally raises an exception since the
+            STLS command doesn't make any sense on an already established
+            SSL/TLS session.
+            """
+            raise error_proto('-ERR TLS session already established')
+
     __all__.append("POP3_SSL")
 
 if __name__ == "__main__":
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -18,6 +18,13 @@
 HOST = test_support.HOST
 PORT = 0
 
+SUPPORTS_SSL = False
+if hasattr(poplib, 'POP3_SSL'):
+    import ssl
+
+    SUPPORTS_SSL = True
+    CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert.pem")
+
 # the dummy data returned by server when LIST and RETR commands are issued
 LIST_RESP = b'1 1\r\n2 2\r\n3 3\r\n4 4\r\n5 5\r\n.\r\n'
 RETR_RESP = b"""From: postmaster at python.org\
@@ -33,11 +40,15 @@
 
 class DummyPOP3Handler(asynchat.async_chat):
 
+    CAPAS = {'UIDL': [], 'IMPLEMENTATION': ['python-testlib-pop-server']}
+
     def __init__(self, conn):
         asynchat.async_chat.__init__(self, conn)
         self.set_terminator(b"\r\n")
         self.in_buffer = []
         self.push('+OK dummy pop3 server ready. <timestamp>')
+        self.tls_active = False
+        self.tls_starting = False
 
     def collect_incoming_data(self, data):
         self.in_buffer.append(data)
@@ -112,6 +123,65 @@
         self.push('+OK closing.')
         self.close_when_done()
 
+    def _get_capas(self):
+        _capas = dict(self.CAPAS)
+        if not self.tls_active and SUPPORTS_SSL:
+            _capas['STLS'] = []
+        return _capas
+
+    def cmd_capa(self, arg):
+        self.push('+OK Capability list follows')
+        if self._get_capas():
+            for cap, params in self._get_capas().items():
+                _ln = [cap]
+                if params:
+                    _ln.extend(params)
+                self.push(' '.join(_ln))
+        self.push('.')
+
+    if SUPPORTS_SSL:
+
+        def cmd_stls(self, arg):
+            if self.tls_active is False:
+                self.push('+OK Begin TLS negotiation')
+                tls_sock = ssl.wrap_socket(self.socket, certfile=CERTFILE,
+                                           server_side=True,
+                                           do_handshake_on_connect=False,
+                                           suppress_ragged_eofs=False)
+                self.del_channel()
+                self.set_socket(tls_sock)
+                self.tls_active = True
+                self.tls_starting = True
+                self.in_buffer = []
+                self._do_tls_handshake()
+            else:
+                self.push('-ERR Command not permitted when TLS active')
+
+        def _do_tls_handshake(self):
+            try:
+                self.socket.do_handshake()
+            except ssl.SSLError as err:
+                if err.args[0] in (ssl.SSL_ERROR_WANT_READ,
+                                   ssl.SSL_ERROR_WANT_WRITE):
+                    return
+                elif err.args[0] == ssl.SSL_ERROR_EOF:
+                    return self.handle_close()
+                raise
+            except socket.error as err:
+                if err.args[0] == errno.ECONNABORTED:
+                    return self.handle_close()
+            else:
+                self.tls_active = True
+                self.tls_starting = False
+
+        def handle_read(self):
+            if self.tls_starting:
+                self._do_tls_handshake()
+            else:
+                try:
+                    asynchat.async_chat.handle_read(self)
+                except ssl.SSLEOFError:
+                    self.handle_close()
 
 class DummyPOP3Server(asyncore.dispatcher, threading.Thread):
 
@@ -232,19 +302,35 @@
         self.client.uidl()
         self.client.uidl('foo')
 
+    def test_capa(self):
+        capa = self.client.capa()
+        self.assertTrue('IMPLEMENTATION' in capa.keys())
+
     def test_quit(self):
         resp = self.client.quit()
         self.assertTrue(resp)
         self.assertIsNone(self.client.sock)
         self.assertIsNone(self.client.file)
 
+    if SUPPORTS_SSL:
 
-SUPPORTS_SSL = False
-if hasattr(poplib, 'POP3_SSL'):
-    import ssl
+        def test_stls_capa(self):
+            capa = self.client.capa()
+            self.assertTrue('STLS' in capa.keys())
 
-    SUPPORTS_SSL = True
-    CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert.pem")
+        def test_stls(self):
+            expected = b'+OK Begin TLS negotiation'
+            resp = self.client.stls()
+            self.assertEqual(resp, expected)
+
+        def test_stls_context(self):
+            expected = b'+OK Begin TLS negotiation'
+            ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+            resp = self.client.stls(context=ctx)
+            self.assertEqual(resp, expected)
+
+
+if SUPPORTS_SSL:
 
     class DummyPOP3_SSLHandler(DummyPOP3Handler):
 
@@ -256,34 +342,13 @@
             self.del_channel()
             self.set_socket(ssl_socket)
             # Must try handshake before calling push()
-            self._ssl_accepting = True
-            self._do_ssl_handshake()
+            self.tls_active = True
+            self.tls_starting = True
+            self._do_tls_handshake()
             self.set_terminator(b"\r\n")
             self.in_buffer = []
             self.push('+OK dummy pop3 server ready. <timestamp>')
 
-        def _do_ssl_handshake(self):
-            try:
-                self.socket.do_handshake()
-            except ssl.SSLError as err:
-                if err.args[0] in (ssl.SSL_ERROR_WANT_READ,
-                                   ssl.SSL_ERROR_WANT_WRITE):
-                    return
-                elif err.args[0] == ssl.SSL_ERROR_EOF:
-                    return self.handle_close()
-                raise
-            except socket.error as err:
-                if err.args[0] == errno.ECONNABORTED:
-                    return self.handle_close()
-            else:
-                self._ssl_accepting = False
-
-        def handle_read(self):
-            if self._ssl_accepting:
-                self._do_ssl_handshake()
-            else:
-                DummyPOP3Handler.handle_read(self)
-
 
     class TestPOP3_SSLClass(TestPOP3Class):
         # repeat previous tests by using poplib.POP3_SSL
@@ -314,6 +379,39 @@
             self.assertIs(self.client.sock.context, ctx)
             self.assertTrue(self.client.noop().startswith(b'+OK'))
 
+        def test_stls(self):
+            self.assertRaises(poplib.error_proto, self.client.stls)
+
+        test_stls_context = test_stls
+
+        def test_stls_capa(self):
+            capa = self.client.capa()
+            self.assertFalse('STLS' in capa.keys())
+
+
+    class TestPOP3_TLSClass(TestPOP3Class):
+        # repeat previous tests by using poplib.POP3.stls()
+
+        def setUp(self):
+            self.server = DummyPOP3Server((HOST, PORT))
+            self.server.start()
+            self.client = poplib.POP3(self.server.host, self.server.port, timeout=3)
+            self.client.stls()
+
+        def tearDown(self):
+            if self.client.file is not None and self.client.sock is not None:
+                self.client.quit()
+            self.server.stop()
+
+        def test_stls(self):
+            self.assertRaises(poplib.error_proto, self.client.stls)
+
+        test_stls_context = test_stls
+
+        def test_stls_capa(self):
+            capa = self.client.capa()
+            self.assertFalse(b'STLS' in capa.keys())
+
 
 class TestTimeouts(TestCase):
 
@@ -373,6 +471,7 @@
     tests = [TestPOP3Class, TestTimeouts]
     if SUPPORTS_SSL:
         tests.append(TestPOP3_SSLClass)
+        tests.append(TestPOP3_TLSClass)
     thread_info = test_support.threading_setup()
     try:
         test_support.run_unittest(*tests)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,15 @@
 Library
 -------
 
+- Issue #4473: Add a POP3.stls() to switch a clear-text POP3 session into
+  an encrypted POP3 session, on supported servers.  Patch by Lorenzo Catucci.
+
+- Issue #4473: Add a POP3.capa() method to query the capabilities advertised
+  by the POP3 server.  Patch by Lorenzo Catucci.
+
+- Issue #4473: Ensure the socket is shutdown cleanly in POP3.close().
+  Patch by Lorenzo Catucci.
+
 - Issue #16522: added FAIL_FAST flag to doctest.
 
 - Issue #15627: Add the importlib.abc.SourceLoader.compile_source() method.

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

From python-checkins at python.org  Fri Nov 23 21:17:12 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 21:17:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Remove_debug_p?=
	=?utf-8?q?rint=2E?=
Message-ID: <3Y7TMX5pNkzQSN@mail.python.org>

http://hg.python.org/cpython/rev/229d6f650a63
changeset:   80579:229d6f650a63
branch:      3.2
parent:      80570:1cf1194a443e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 22:16:07 2012 +0200
summary:
  Remove debug print.

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


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -104,10 +104,6 @@
                      'need a filesystem encoding different than ASCII')
     def test_non_ascii(self):
         # Test handling of non-ascii data
-        if test.support.verbose:
-            import locale
-            print('locale encoding = %s, filesystem encoding = %s'
-                  % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
         command = "assert(ord('\xe9') == 0xe9)"
         assert_python_ok('-c', command)
 

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

From python-checkins at python.org  Fri Nov 23 21:17:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 21:17:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_debug_print_removal_with_3=2E2=2E?=
Message-ID: <3Y7TMZ0xxgzQSN@mail.python.org>

http://hg.python.org/cpython/rev/c47235bfab44
changeset:   80580:c47235bfab44
branch:      3.3
parent:      80576:fe2200c1c2d3
parent:      80579:229d6f650a63
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 22:16:45 2012 +0200
summary:
  Merge debug print removal with 3.2.

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


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -97,10 +97,6 @@
     @unittest.skipUnless(test.support.FS_NONASCII, 'need support.FS_NONASCII')
     def test_non_ascii(self):
         # Test handling of non-ascii data
-        if test.support.verbose:
-            import locale
-            print('locale encoding = %s, filesystem encoding = %s'
-                  % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
         command = ("assert(ord(%r) == %s)"
                    % (test.support.FS_NONASCII, ord(test.support.FS_NONASCII)))
         assert_python_ok('-c', command)

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

From python-checkins at python.org  Fri Nov 23 21:17:15 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 23 Nov 2012 21:17:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_debug_print_removal_with_3=2E3=2E?=
Message-ID: <3Y7TMb3DXyzRP5@mail.python.org>

http://hg.python.org/cpython/rev/ce3b22951c7e
changeset:   80581:ce3b22951c7e
parent:      80578:aa4cfd84d449
parent:      80580:c47235bfab44
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 23 22:17:02 2012 +0200
summary:
  Merge debug print removal with 3.3.

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


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -97,10 +97,6 @@
     @unittest.skipUnless(test.support.FS_NONASCII, 'need support.FS_NONASCII')
     def test_non_ascii(self):
         # Test handling of non-ascii data
-        if test.support.verbose:
-            import locale
-            print('locale encoding = %s, filesystem encoding = %s'
-                  % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
         command = ("assert(ord(%r) == %s)"
                    % (test.support.FS_NONASCII, ord(test.support.FS_NONASCII)))
         assert_python_ok('-c', command)

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

From python-checkins at python.org  Fri Nov 23 23:36:06 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 23 Nov 2012 23:36:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Fix_make=5Fperf3=2Esh_f?=
	=?utf-8?q?or_new_Mako?=
Message-ID: <3Y7XRp6g5TzRQQ@mail.python.org>

http://hg.python.org/benchmarks/rev/c5c5238b8516
changeset:   192:c5c5238b8516
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Nov 23 23:35:05 2012 +0100
summary:
  Fix make_perf3.sh for new Mako

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


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="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"
+SAFE_LIBS_TO_TRANSLATE="2to3 mako-0.3.6 Mako-0.7.3"
 # Libraries whose source is Python 3 only.
 SAFE_LIBS_PORTED=""
 

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

From python-checkins at python.org  Fri Nov 23 23:42:00 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 23 Nov 2012 23:42:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Add_notes=2E?=
Message-ID: <3Y7XZc0CCRzRPW@mail.python.org>

http://hg.python.org/benchmarks/rev/43f8a0f5edd3
changeset:   193:43f8a0f5edd3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Nov 23 23:40:58 2012 +0100
summary:
  Add notes.

files:
  README.txt    |  12 ++++++++++++
  make_perf3.sh |   3 +++
  2 files changed, 15 insertions(+), 0 deletions(-)


diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -24,6 +24,18 @@
     $ python perf.py -r -b apps /control/python /test/python
 
 
+Notable Benchmark groups
+------------------------
+
+Like individual benchmarks (see "Available benchmarks" below), benchmarks
+group are allowed after the `-b` option.
+
+- 2n3 - benchmarks compatible with both Python 2 and Python 3
+- apps - "high-level" applicative benchmarks
+- serialize - various serialization libraries
+- template - various third-party template engines
+
+
 Available Benchmarks
 --------------------
 
diff --git a/make_perf3.sh b/make_perf3.sh
--- a/make_perf3.sh
+++ b/make_perf3.sh
@@ -1,5 +1,8 @@
 #! /usr/bin/env bash
 #
+# NOTE: most benchmarks are natively Python 3-compatible and don't need
+# to be translated.  Simply run perf.py with `-b 2n3` to run them.
+#
 # Usage:
 #   hg clone http://hg.python.org/benchmarks/ py2benchmarks
 #   mkdir py3benchmarks;

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

From solipsis at pitrou.net  Sat Nov 24 05:56:49 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 24 Nov 2012 05:56:49 +0100
Subject: [Python-checkins] Daily reference leaks (ce3b22951c7e): sum=0
Message-ID: <E1Tc7nN-00078n-M3@ap.vmr.nerim.net>

results for ce3b22951c7e on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Sat Nov 24 18:00:13 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 24 Nov 2012 18:00:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316423=3A_urllib?=
 =?utf-8?q?=2Erequest_now_has_support_for_=60=60data=3A=60=60_URLs=2E?=
Message-ID: <3Y80xn6xcYzRRR@mail.python.org>

http://hg.python.org/cpython/rev/a182367eac5a
changeset:   80582:a182367eac5a
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 24 17:59:08 2012 +0100
summary:
  Issue #16423: urllib.request now has support for ``data:`` URLs.
Patch by Mathias Panzenb?ck.

files:
  Doc/library/urllib.request.rst |  26 +++++++-
  Lib/test/test_urllib.py        |  74 ++++++++++++++++++++++
  Lib/urllib/request.py          |  38 ++++++++++-
  Misc/ACKS                      |   1 +
  Misc/NEWS                      |   3 +
  5 files changed, 137 insertions(+), 5 deletions(-)


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -121,7 +121,7 @@
    instances of them or subclasses of them: :class:`ProxyHandler`,
    :class:`UnknownHandler`, :class:`HTTPHandler`, :class:`HTTPDefaultErrorHandler`,
    :class:`HTTPRedirectHandler`, :class:`FTPHandler`, :class:`FileHandler`,
-   :class:`HTTPErrorProcessor`.
+   :class:`HTTPErrorProcessor`, :class:`DataHandler`.
 
    If the Python installation has SSL support (i.e., if the :mod:`ssl` module
    can be imported), :class:`HTTPSHandler` will also be added.
@@ -346,6 +346,11 @@
 
    Open local files.
 
+.. class:: DataHandler()
+
+   Open data URLs.
+
+   .. versionadded:: 3.4
 
 .. class:: FTPHandler()
 
@@ -972,6 +977,21 @@
       hostname is given, an :exc:`URLError` is raised.
 
 
+.. _data-handler-objects:
+
+DataHandler Objects
+-------------------
+
+.. method:: DataHandler.data_open(req)
+
+   Read a data URL. This kind of URL contains the content encoded in the URL
+   itself. The data URL syntax is specified in :rfc:`2397`. This implementation
+   ignores white spaces in base64 encoded data URLs so the URL may be wrapped
+   in whatever source file it comes from. But even though some browsers don't
+   mind about a missing padding at the end of a base64 encoded data URL, this
+   implementation will raise an :exc:`ValueError` in that case.
+
+
 .. _ftp-handler-objects:
 
 FTPHandler Objects
@@ -1374,7 +1394,9 @@
      pair: FTP; protocol
 
 * Currently, only the following protocols are supported: HTTP (versions 0.9 and
-  1.0), FTP, and local files.
+  1.0), FTP, local files, and data URLs.
+
+  .. versionchanged:: 3.4 Added support for data URLs.
 
 * The caching feature of :func:`urlretrieve` has been disabled until someone
   finds the time to hack proper processing of Expiration time headers.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -337,6 +337,79 @@
         with support.check_warnings(('',DeprecationWarning)):
             urllib.request.URLopener()
 
+class urlopen_DataTests(unittest.TestCase):
+    """Test urlopen() opening a data URL."""
+
+    def setUp(self):
+        # text containing URL special- and unicode-characters
+        self.text = "test data URLs :;,%=& \u00f6 \u00c4 "
+        # 2x1 pixel RGB PNG image with one black and one white pixel
+        self.image = (
+            b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x02\x00\x00\x00'
+            b'\x01\x08\x02\x00\x00\x00{@\xe8\xdd\x00\x00\x00\x01sRGB\x00\xae'
+            b'\xce\x1c\xe9\x00\x00\x00\x0fIDAT\x08\xd7c```\xf8\xff\xff?\x00'
+            b'\x06\x01\x02\xfe\no/\x1e\x00\x00\x00\x00IEND\xaeB`\x82')
+
+        self.text_url = (
+            "data:text/plain;charset=UTF-8,test%20data%20URLs%20%3A%3B%2C%25%3"
+            "D%26%20%C3%B6%20%C3%84%20")
+        self.text_url_base64 = (
+            "data:text/plain;charset=ISO-8859-1;base64,dGVzdCBkYXRhIFVSTHMgOjs"
+            "sJT0mIPYgxCA%3D")
+        # base64 encoded data URL that contains ignorable spaces,
+        # such as "\n", " ", "%0A", and "%20".
+        self.image_url = (
+            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAIAAAB7\n"
+            "QOjdAAAAAXNSR0IArs4c6QAAAA9JREFUCNdj%0AYGBg%2BP//PwAGAQL%2BCm8 "
+            "vHgAAAABJRU5ErkJggg%3D%3D%0A%20")
+
+        self.text_url_resp = urllib.request.urlopen(self.text_url)
+        self.text_url_base64_resp = urllib.request.urlopen(
+            self.text_url_base64)
+        self.image_url_resp = urllib.request.urlopen(self.image_url)
+
+    def test_interface(self):
+        # Make sure object returned by urlopen() has the specified methods
+        for attr in ("read", "readline", "readlines",
+                     "close", "info", "geturl", "getcode", "__iter__"):
+            self.assertTrue(hasattr(self.text_url_resp, attr),
+                         "object returned by urlopen() lacks %s attribute" %
+                         attr)
+
+    def test_info(self):
+        self.assertIsInstance(self.text_url_resp.info(), email.message.Message)
+        self.assertEqual(self.text_url_base64_resp.info().get_params(),
+            [('text/plain', ''), ('charset', 'ISO-8859-1')])
+        self.assertEqual(self.image_url_resp.info()['content-length'],
+            str(len(self.image)))
+        self.assertEqual(urllib.request.urlopen("data:,").info().get_params(),
+            [('text/plain', ''), ('charset', 'US-ASCII')])
+
+    def test_geturl(self):
+        self.assertEqual(self.text_url_resp.geturl(), self.text_url)
+        self.assertEqual(self.text_url_base64_resp.geturl(),
+            self.text_url_base64)
+        self.assertEqual(self.image_url_resp.geturl(), self.image_url)
+
+    def test_read_text(self):
+        self.assertEqual(self.text_url_resp.read().decode(
+            dict(self.text_url_resp.info().get_params())['charset']), self.text)
+
+    def test_read_text_base64(self):
+        self.assertEqual(self.text_url_base64_resp.read().decode(
+            dict(self.text_url_base64_resp.info().get_params())['charset']),
+            self.text)
+
+    def test_read_image(self):
+        self.assertEqual(self.image_url_resp.read(), self.image)
+
+    def test_missing_comma(self):
+        self.assertRaises(ValueError,urllib.request.urlopen,'data:text/plain')
+
+    def test_invalid_base64_data(self):
+        # missing padding character
+        self.assertRaises(ValueError,urllib.request.urlopen,'data:;base64,Cg=')
+
 class urlretrieve_FileTests(unittest.TestCase):
     """Test urllib.urlretrieve() on local files"""
 
@@ -1313,6 +1386,7 @@
     support.run_unittest(
         urlopen_FileTests,
         urlopen_HttpTests,
+        urlopen_DataTests,
         urlretrieve_FileTests,
         urlretrieve_HttpTests,
         ProxyTests,
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -103,7 +103,8 @@
 from urllib.parse import (
     urlparse, urlsplit, urljoin, unwrap, quote, unquote,
     splittype, splithost, splitport, splituser, splitpasswd,
-    splitattr, splitquery, splitvalue, splittag, to_bytes, urlunparse)
+    splitattr, splitquery, splitvalue, splittag, to_bytes,
+    unquote_to_bytes, urlunparse)
 from urllib.response import addinfourl, addclosehook
 
 # check for SSL
@@ -121,7 +122,7 @@
     'HTTPPasswordMgr', 'HTTPPasswordMgrWithDefaultRealm',
     'AbstractBasicAuthHandler', 'HTTPBasicAuthHandler', 'ProxyBasicAuthHandler',
     'AbstractDigestAuthHandler', 'HTTPDigestAuthHandler', 'ProxyDigestAuthHandler',
-    'HTTPHandler', 'FileHandler', 'FTPHandler', 'CacheFTPHandler',
+    'HTTPHandler', 'FileHandler', 'FTPHandler', 'CacheFTPHandler', 'DataHandler',
     'UnknownHandler', 'HTTPErrorProcessor',
     # Functions
     'urlopen', 'install_opener', 'build_opener',
@@ -535,7 +536,8 @@
     opener = OpenerDirector()
     default_classes = [ProxyHandler, UnknownHandler, HTTPHandler,
                        HTTPDefaultErrorHandler, HTTPRedirectHandler,
-                       FTPHandler, FileHandler, HTTPErrorProcessor]
+                       FTPHandler, FileHandler, HTTPErrorProcessor,
+                       DataHandler]
     if hasattr(http.client, "HTTPSConnection"):
         default_classes.append(HTTPSHandler)
     skip = set()
@@ -1541,6 +1543,36 @@
         self.cache.clear()
         self.timeout.clear()
 
+class DataHandler(BaseHandler):
+    def data_open(self, req):
+        # data URLs as specified in RFC 2397.
+        #
+        # ignores POSTed data
+        #
+        # syntax:
+        # dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
+        # mediatype := [ type "/" subtype ] *( ";" parameter )
+        # data      := *urlchar
+        # parameter := attribute "=" value
+        url = req.full_url
+
+        scheme, data = url.split(":",1)
+        mediatype, data = data.split(",",1)
+
+        # even base64 encoded data URLs might be quoted so unquote in any case:
+        data = unquote_to_bytes(data)
+        if mediatype.endswith(";base64"):
+            data = base64.decodebytes(data)
+            mediatype = mediatype[:-7]
+
+        if not mediatype:
+            mediatype = "text/plain;charset=US-ASCII"
+
+        headers = email.message_from_string("Content-type: %s\nContent-length: %d\n" %
+            (mediatype, len(data)))
+
+        return addinfourl(io.BytesIO(data), headers, url)
+
 
 # Code move from the old urllib module
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -884,6 +884,7 @@
 Todd R. Palmer
 Juan David Ib??ez Palomar
 Jan Palus
+Mathias Panzenb?ck
 M. Papillon
 Peter Parente
 Alexandre Parenteau
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,9 @@
 Library
 -------
 
+- Issue #16423: urllib.request now has support for ``data:`` URLs.  Patch by
+  Mathias Panzenb?ck.
+
 - Issue #4473: Add a POP3.stls() to switch a clear-text POP3 session into
   an encrypted POP3 session, on supported servers.  Patch by Lorenzo Catucci.
 

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

From python-checkins at python.org  Sat Nov 24 18:15:20 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 24 Nov 2012 18:15:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_missing_import_=28foll?=
	=?utf-8?b?b3d1cCB0byAjNDQ3Myku?=
Message-ID: <3Y81HD3zRHzQ3l@mail.python.org>

http://hg.python.org/cpython/rev/75a146a657d9
changeset:   80583:75a146a657d9
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 24 18:14:12 2012 +0100
summary:
  Fix missing import (followup to #4473).

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


diff --git a/Lib/poplib.py b/Lib/poplib.py
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -13,7 +13,9 @@
 
 # Imports
 
-import re, socket
+import errno
+import re
+import socket
 
 try:
     import ssl

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

From python-checkins at python.org  Sat Nov 24 18:26:27 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 24 Nov 2012 18:26:27 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogdGVzdF93aW5zb3Vu?=
 =?utf-8?q?d_should_require_the_=22audio=22_resource=2C_as_it_does_on_3=2E?=
 =?utf-8?q?x=2E?=
Message-ID: <3Y81X36nXdzRQl@mail.python.org>

http://hg.python.org/cpython/rev/6e7a083f893f
changeset:   80584:6e7a083f893f
branch:      2.7
parent:      80569:a2038edb51cd
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 24 18:25:25 2012 +0100
summary:
  test_winsound should require the "audio" resource, as it does on 3.x.
(this should fix some buildbot test failures)

files:
  Lib/test/test_winsound.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py
--- a/Lib/test/test_winsound.py
+++ b/Lib/test/test_winsound.py
@@ -2,6 +2,7 @@
 
 import unittest
 from test import test_support
+test_support.requires('audio')
 import time
 import os
 import subprocess

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

From python-checkins at python.org  Sat Nov 24 20:44:42 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 24 Nov 2012 20:44:42 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzEyODQ4?=
 =?utf-8?q?=3A_The_pure_Python_pickle_implementation_now_treats_object_len?=
 =?utf-8?q?gths?=
Message-ID: <3Y84bZ6JP2zQcJ@mail.python.org>

http://hg.python.org/cpython/rev/55fe4b57dd9c
changeset:   80585:55fe4b57dd9c
branch:      3.2
parent:      80579:229d6f650a63
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 24 20:40:21 2012 +0100
summary:
  Issue #12848: The pure Python pickle implementation now treats object lengths as unsigned 32-bit integers, like the C implementation does.
Patch by Serhiy Storchaka.

files:
  Lib/pickle.py     |  39 +++++++++++++++++++++++-----------
  Misc/NEWS         |   4 +++
  Modules/_pickle.c |   2 +-
  3 files changed, 31 insertions(+), 14 deletions(-)


diff --git a/Lib/pickle.py b/Lib/pickle.py
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -265,7 +265,7 @@
             if i < 256:
                 return BINPUT + bytes([i])
             else:
-                return LONG_BINPUT + pack("<i", i)
+                return LONG_BINPUT + pack("<I", i)
 
         return PUT + repr(i).encode("ascii") + b'\n'
 
@@ -275,7 +275,7 @@
             if i < 256:
                 return BINGET + bytes([i])
             else:
-                return LONG_BINGET + pack("<i", i)
+                return LONG_BINGET + pack("<I", i)
 
         return GET + repr(i).encode("ascii") + b'\n'
 
@@ -497,7 +497,7 @@
         if n < 256:
             self.write(SHORT_BINBYTES + bytes([n]) + bytes(obj))
         else:
-            self.write(BINBYTES + pack("<i", n) + bytes(obj))
+            self.write(BINBYTES + pack("<I", n) + bytes(obj))
         self.memoize(obj)
     dispatch[bytes] = save_bytes
 
@@ -505,7 +505,7 @@
         if self.bin:
             encoded = obj.encode('utf-8', 'surrogatepass')
             n = len(encoded)
-            self.write(BINUNICODE + pack("<i", n) + encoded)
+            self.write(BINUNICODE + pack("<I", n) + encoded)
         else:
             obj = obj.replace("\\", "\\u005c")
             obj = obj.replace("\n", "\\u000a")
@@ -925,6 +925,9 @@
 
     def load_long4(self):
         n = mloads(b'i' + self.read(4))
+        if n < 0:
+            # Corrupt or hostile pickle -- we never write one like this
+            raise UnpicklingError("LONG pickle has negative byte count");
         data = self.read(n)
         self.append(decode_long(data))
     dispatch[LONG4[0]] = load_long4
@@ -953,14 +956,19 @@
     dispatch[STRING[0]] = load_string
 
     def load_binstring(self):
+        # Deprecated BINSTRING uses signed 32-bit length
         len = mloads(b'i' + self.read(4))
+        if len < 0:
+            raise UnpicklingError("BINSTRING pickle has negative byte count");
         data = self.read(len)
         value = str(data, self.encoding, self.errors)
         self.append(value)
     dispatch[BINSTRING[0]] = load_binstring
 
-    def load_binbytes(self):
-        len = mloads(b'i' + self.read(4))
+    def load_binbytes(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        len, = unpack('<I', self.read(4))
+        if len > maxsize:
+            raise UnpicklingError("BINBYTES exceeds system's maximum size of %d bytes" % maxsize);
         self.append(self.read(len))
     dispatch[BINBYTES[0]] = load_binbytes
 
@@ -968,8 +976,10 @@
         self.append(str(self.readline()[:-1], 'raw-unicode-escape'))
     dispatch[UNICODE[0]] = load_unicode
 
-    def load_binunicode(self):
-        len = mloads(b'i' + self.read(4))
+    def load_binunicode(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        len, = unpack('<I', self.read(4))
+        if len > maxsize:
+            raise UnpicklingError("BINUNICODE exceeds system's maximum size of %d bytes" % maxsize);
         self.append(str(self.read(len), 'utf-8', 'surrogatepass'))
     dispatch[BINUNICODE[0]] = load_binunicode
 
@@ -1100,6 +1110,9 @@
             return
         key = _inverted_registry.get(code)
         if not key:
+            if code <= 0: # note that 0 is forbidden
+                # Corrupt or hostile pickle.
+                raise UnpicklingError("EXT specifies code <= 0");
             raise ValueError("unregistered extension code %d" % code)
         obj = self.find_class(*key)
         _extension_cache[code] = obj
@@ -1153,8 +1166,8 @@
         self.append(self.memo[i])
     dispatch[BINGET[0]] = load_binget
 
-    def load_long_binget(self):
-        i = mloads(b'i' + self.read(4))
+    def load_long_binget(self, unpack=struct.unpack):
+        i, = unpack('<I', self.read(4))
         self.append(self.memo[i])
     dispatch[LONG_BINGET[0]] = load_long_binget
 
@@ -1172,9 +1185,9 @@
         self.memo[i] = self.stack[-1]
     dispatch[BINPUT[0]] = load_binput
 
-    def load_long_binput(self):
-        i = mloads(b'i' + self.read(4))
-        if i < 0:
+    def load_long_binput(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        i, = unpack('<I', self.read(4))
+        if i > maxsize:
             raise ValueError("negative LONG_BINPUT argument")
         self.memo[i] = self.stack[-1]
     dispatch[LONG_BINPUT[0]] = load_long_binput
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,10 @@
 Library
 -------
 
+- Issue #12848: The pure Python pickle implementation now treats object
+  lengths as unsigned 32-bit integers, like the C implementation does.
+  Patch by Serhiy Storchaka.
+
 - Issue #1160: Fix compiling large regular expressions on UCS2 builds.
   Patch by Serhiy Storchaka.
 
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1579,7 +1579,7 @@
          * byte at the start, and cut it back later if possible.
          */
         nbytes = (nbits >> 3) + 1;
-        if (nbytes > INT_MAX) {
+        if (nbytes > 0x7fffffffL) {
             PyErr_SetString(PyExc_OverflowError,
                             "long too large to pickle");
             goto error;

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

From python-checkins at python.org  Sat Nov 24 20:44:44 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 24 Nov 2012 20:44:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2312848=3A_The_pure_Python_pickle_implementation_now_tr?=
 =?utf-8?q?eats_object_lengths?=
Message-ID: <3Y84bc36tMzRRg@mail.python.org>

http://hg.python.org/cpython/rev/c9d205e2dd02
changeset:   80586:c9d205e2dd02
branch:      3.3
parent:      80580:c47235bfab44
parent:      80585:55fe4b57dd9c
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 24 20:41:34 2012 +0100
summary:
  Issue #12848: The pure Python pickle implementation now treats object lengths as unsigned 32-bit integers, like the C implementation does.
Patch by Serhiy Storchaka.

files:
  Lib/pickle.py     |  39 +++++++++++++++++++++++-----------
  Misc/NEWS         |   4 +++
  Modules/_pickle.c |   2 +-
  3 files changed, 31 insertions(+), 14 deletions(-)


diff --git a/Lib/pickle.py b/Lib/pickle.py
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -263,7 +263,7 @@
             if i < 256:
                 return BINPUT + bytes([i])
             else:
-                return LONG_BINPUT + pack("<i", i)
+                return LONG_BINPUT + pack("<I", i)
 
         return PUT + repr(i).encode("ascii") + b'\n'
 
@@ -273,7 +273,7 @@
             if i < 256:
                 return BINGET + bytes([i])
             else:
-                return LONG_BINGET + pack("<i", i)
+                return LONG_BINGET + pack("<I", i)
 
         return GET + repr(i).encode("ascii") + b'\n'
 
@@ -503,7 +503,7 @@
         if n < 256:
             self.write(SHORT_BINBYTES + bytes([n]) + bytes(obj))
         else:
-            self.write(BINBYTES + pack("<i", n) + bytes(obj))
+            self.write(BINBYTES + pack("<I", n) + bytes(obj))
         self.memoize(obj)
     dispatch[bytes] = save_bytes
 
@@ -511,7 +511,7 @@
         if self.bin:
             encoded = obj.encode('utf-8', 'surrogatepass')
             n = len(encoded)
-            self.write(BINUNICODE + pack("<i", n) + encoded)
+            self.write(BINUNICODE + pack("<I", n) + encoded)
         else:
             obj = obj.replace("\\", "\\u005c")
             obj = obj.replace("\n", "\\u000a")
@@ -931,6 +931,9 @@
 
     def load_long4(self):
         n = mloads(b'i' + self.read(4))
+        if n < 0:
+            # Corrupt or hostile pickle -- we never write one like this
+            raise UnpicklingError("LONG pickle has negative byte count");
         data = self.read(n)
         self.append(decode_long(data))
     dispatch[LONG4[0]] = load_long4
@@ -959,14 +962,19 @@
     dispatch[STRING[0]] = load_string
 
     def load_binstring(self):
+        # Deprecated BINSTRING uses signed 32-bit length
         len = mloads(b'i' + self.read(4))
+        if len < 0:
+            raise UnpicklingError("BINSTRING pickle has negative byte count");
         data = self.read(len)
         value = str(data, self.encoding, self.errors)
         self.append(value)
     dispatch[BINSTRING[0]] = load_binstring
 
-    def load_binbytes(self):
-        len = mloads(b'i' + self.read(4))
+    def load_binbytes(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        len, = unpack('<I', self.read(4))
+        if len > maxsize:
+            raise UnpicklingError("BINBYTES exceeds system's maximum size of %d bytes" % maxsize);
         self.append(self.read(len))
     dispatch[BINBYTES[0]] = load_binbytes
 
@@ -974,8 +982,10 @@
         self.append(str(self.readline()[:-1], 'raw-unicode-escape'))
     dispatch[UNICODE[0]] = load_unicode
 
-    def load_binunicode(self):
-        len = mloads(b'i' + self.read(4))
+    def load_binunicode(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        len, = unpack('<I', self.read(4))
+        if len > maxsize:
+            raise UnpicklingError("BINUNICODE exceeds system's maximum size of %d bytes" % maxsize);
         self.append(str(self.read(len), 'utf-8', 'surrogatepass'))
     dispatch[BINUNICODE[0]] = load_binunicode
 
@@ -1106,6 +1116,9 @@
             return
         key = _inverted_registry.get(code)
         if not key:
+            if code <= 0: # note that 0 is forbidden
+                # Corrupt or hostile pickle.
+                raise UnpicklingError("EXT specifies code <= 0");
             raise ValueError("unregistered extension code %d" % code)
         obj = self.find_class(*key)
         _extension_cache[code] = obj
@@ -1159,8 +1172,8 @@
         self.append(self.memo[i])
     dispatch[BINGET[0]] = load_binget
 
-    def load_long_binget(self):
-        i = mloads(b'i' + self.read(4))
+    def load_long_binget(self, unpack=struct.unpack):
+        i, = unpack('<I', self.read(4))
         self.append(self.memo[i])
     dispatch[LONG_BINGET[0]] = load_long_binget
 
@@ -1178,9 +1191,9 @@
         self.memo[i] = self.stack[-1]
     dispatch[BINPUT[0]] = load_binput
 
-    def load_long_binput(self):
-        i = mloads(b'i' + self.read(4))
-        if i < 0:
+    def load_long_binput(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        i, = unpack('<I', self.read(4))
+        if i > maxsize:
             raise ValueError("negative LONG_BINPUT argument")
         self.memo[i] = self.stack[-1]
     dispatch[LONG_BINPUT[0]] = load_long_binput
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -94,6 +94,10 @@
 Library
 -------
 
+- Issue #12848: The pure Python pickle implementation now treats object
+  lengths as unsigned 32-bit integers, like the C implementation does.
+  Patch by Serhiy Storchaka.
+
 - Issue #16408: Fix file descriptors not being closed in error conditions
   in the zipfile module.  Patch by Serhiy Storchaka.
 
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1589,7 +1589,7 @@
          * byte at the start, and cut it back later if possible.
          */
         nbytes = (nbits >> 3) + 1;
-        if (nbytes > INT_MAX) {
+        if (nbytes > 0x7fffffffL) {
             PyErr_SetString(PyExc_OverflowError,
                             "long too large to pickle");
             goto error;

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

From python-checkins at python.org  Sat Nov 24 20:44:45 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sat, 24 Nov 2012 20:44:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2312848=3A_The_pure_Python_pickle_implementation_?=
 =?utf-8?q?now_treats_object_lengths?=
Message-ID: <3Y84bd6fd7zQcJ@mail.python.org>

http://hg.python.org/cpython/rev/aac6b313ef5f
changeset:   80587:aac6b313ef5f
parent:      80583:75a146a657d9
parent:      80586:c9d205e2dd02
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 24 20:42:59 2012 +0100
summary:
  Issue #12848: The pure Python pickle implementation now treats object lengths as unsigned 32-bit integers, like the C implementation does.
Patch by Serhiy Storchaka.

files:
  Lib/pickle.py     |  39 +++++++++++++++++++++++-----------
  Misc/NEWS         |   4 +++
  Modules/_pickle.c |   2 +-
  3 files changed, 31 insertions(+), 14 deletions(-)


diff --git a/Lib/pickle.py b/Lib/pickle.py
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -263,7 +263,7 @@
             if i < 256:
                 return BINPUT + bytes([i])
             else:
-                return LONG_BINPUT + pack("<i", i)
+                return LONG_BINPUT + pack("<I", i)
 
         return PUT + repr(i).encode("ascii") + b'\n'
 
@@ -273,7 +273,7 @@
             if i < 256:
                 return BINGET + bytes([i])
             else:
-                return LONG_BINGET + pack("<i", i)
+                return LONG_BINGET + pack("<I", i)
 
         return GET + repr(i).encode("ascii") + b'\n'
 
@@ -503,7 +503,7 @@
         if n < 256:
             self.write(SHORT_BINBYTES + bytes([n]) + bytes(obj))
         else:
-            self.write(BINBYTES + pack("<i", n) + bytes(obj))
+            self.write(BINBYTES + pack("<I", n) + bytes(obj))
         self.memoize(obj)
     dispatch[bytes] = save_bytes
 
@@ -511,7 +511,7 @@
         if self.bin:
             encoded = obj.encode('utf-8', 'surrogatepass')
             n = len(encoded)
-            self.write(BINUNICODE + pack("<i", n) + encoded)
+            self.write(BINUNICODE + pack("<I", n) + encoded)
         else:
             obj = obj.replace("\\", "\\u005c")
             obj = obj.replace("\n", "\\u000a")
@@ -931,6 +931,9 @@
 
     def load_long4(self):
         n = mloads(b'i' + self.read(4))
+        if n < 0:
+            # Corrupt or hostile pickle -- we never write one like this
+            raise UnpicklingError("LONG pickle has negative byte count");
         data = self.read(n)
         self.append(decode_long(data))
     dispatch[LONG4[0]] = load_long4
@@ -959,14 +962,19 @@
     dispatch[STRING[0]] = load_string
 
     def load_binstring(self):
+        # Deprecated BINSTRING uses signed 32-bit length
         len = mloads(b'i' + self.read(4))
+        if len < 0:
+            raise UnpicklingError("BINSTRING pickle has negative byte count");
         data = self.read(len)
         value = str(data, self.encoding, self.errors)
         self.append(value)
     dispatch[BINSTRING[0]] = load_binstring
 
-    def load_binbytes(self):
-        len = mloads(b'i' + self.read(4))
+    def load_binbytes(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        len, = unpack('<I', self.read(4))
+        if len > maxsize:
+            raise UnpicklingError("BINBYTES exceeds system's maximum size of %d bytes" % maxsize);
         self.append(self.read(len))
     dispatch[BINBYTES[0]] = load_binbytes
 
@@ -974,8 +982,10 @@
         self.append(str(self.readline()[:-1], 'raw-unicode-escape'))
     dispatch[UNICODE[0]] = load_unicode
 
-    def load_binunicode(self):
-        len = mloads(b'i' + self.read(4))
+    def load_binunicode(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        len, = unpack('<I', self.read(4))
+        if len > maxsize:
+            raise UnpicklingError("BINUNICODE exceeds system's maximum size of %d bytes" % maxsize);
         self.append(str(self.read(len), 'utf-8', 'surrogatepass'))
     dispatch[BINUNICODE[0]] = load_binunicode
 
@@ -1106,6 +1116,9 @@
             return
         key = _inverted_registry.get(code)
         if not key:
+            if code <= 0: # note that 0 is forbidden
+                # Corrupt or hostile pickle.
+                raise UnpicklingError("EXT specifies code <= 0");
             raise ValueError("unregistered extension code %d" % code)
         obj = self.find_class(*key)
         _extension_cache[code] = obj
@@ -1159,8 +1172,8 @@
         self.append(self.memo[i])
     dispatch[BINGET[0]] = load_binget
 
-    def load_long_binget(self):
-        i = mloads(b'i' + self.read(4))
+    def load_long_binget(self, unpack=struct.unpack):
+        i, = unpack('<I', self.read(4))
         self.append(self.memo[i])
     dispatch[LONG_BINGET[0]] = load_long_binget
 
@@ -1178,9 +1191,9 @@
         self.memo[i] = self.stack[-1]
     dispatch[BINPUT[0]] = load_binput
 
-    def load_long_binput(self):
-        i = mloads(b'i' + self.read(4))
-        if i < 0:
+    def load_long_binput(self, unpack=struct.unpack, maxsize=sys.maxsize):
+        i, = unpack('<I', self.read(4))
+        if i > maxsize:
             raise ValueError("negative LONG_BINPUT argument")
         self.memo[i] = self.stack[-1]
     dispatch[LONG_BINPUT[0]] = load_long_binput
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,10 @@
 Library
 -------
 
+- Issue #12848: The pure Python pickle implementation now treats object
+  lengths as unsigned 32-bit integers, like the C implementation does.
+  Patch by Serhiy Storchaka.
+
 - Issue #16423: urllib.request now has support for ``data:`` URLs.  Patch by
   Mathias Panzenb?ck.
 
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1589,7 +1589,7 @@
          * byte at the start, and cut it back later if possible.
          */
         nbytes = (nbits >> 3) + 1;
-        if (nbytes > INT_MAX) {
+        if (nbytes > 0x7fffffffL) {
             PyErr_SetString(PyExc_OverflowError,
                             "long too large to pickle");
             goto error;

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

From solipsis at pitrou.net  Sun Nov 25 05:56:43 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 25 Nov 2012 05:56:43 +0100
Subject: [Python-checkins] Daily reference leaks (aac6b313ef5f): sum=0
Message-ID: <E1TcUGp-0006pE-6v@ap.vmr.nerim.net>

results for aac6b313ef5f on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Sun Nov 25 14:26:07 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 25 Nov 2012 14:26:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MzM5?=
 =?utf-8?q?=3A_Document_and_test_exec=28stmt=2C_globals=2C_locals=29_form_?=
 =?utf-8?q?in_Python_2=2E7=2E?=
Message-ID: <3Y8X8H0jpNzRX7@mail.python.org>

http://hg.python.org/cpython/rev/fd9c9579050d
changeset:   80588:fd9c9579050d
branch:      2.7
parent:      80584:6e7a083f893f
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 25 13:25:57 2012 +0000
summary:
  Issue #16339: Document and test exec(stmt, globals, locals) form in Python 2.7.

files:
  Doc/reference/simple_stmts.rst |  27 +++++++++++++-------
  Lib/test/test_compile.py       |  28 ++++++++++++++++++++++
  2 files changed, 45 insertions(+), 10 deletions(-)


diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -978,18 +978,18 @@
    exec_stmt: "exec" `or_expr` ["in" `expression` ["," `expression`]]
 
 This statement supports dynamic execution of Python code.  The first expression
-should evaluate to either a string, an open file object, or a code object.  If
-it is a string, the string is parsed as a suite of Python statements which is
-then executed (unless a syntax error occurs). [#]_  If it is an open file, the file
-is parsed until EOF and executed.  If it is a code object, it is simply
-executed.  In all cases, the code that's executed is expected to be valid as
-file input (see section :ref:`file-input`).  Be aware that the
-:keyword:`return` and :keyword:`yield` statements may not be used outside of
-function definitions even within the context of code passed to the
-:keyword:`exec` statement.
+should evaluate to either a string, an open file object, a code object, or a
+tuple.  If it is a string, the string is parsed as a suite of Python statements
+which is then executed (unless a syntax error occurs). [#]_ If it is an open
+file, the file is parsed until EOF and executed.  If it is a code object, it is
+simply executed.  For the interpretation of a tuple, see below.  In all cases,
+the code that's executed is expected to be valid as file input (see section
+:ref:`file-input`).  Be aware that the :keyword:`return` and :keyword:`yield`
+statements may not be used outside of function definitions even within the
+context of code passed to the :keyword:`exec` statement.
 
 In all cases, if the optional parts are omitted, the code is executed in the
-current scope.  If only the first expression after :keyword:`in` is specified,
+current scope.  If only the first expression after ``in`` is specified,
 it should be a dictionary, which will be used for both the global and the local
 variables.  If two expressions are given, they are used for the global and local
 variables, respectively. If provided, *locals* can be any mapping object.
@@ -997,6 +997,13 @@
 two separate objects are given as *globals* and *locals*, the code will be
 executed as if it were embedded in a class definition.
 
+The first expression may also be a tuple of length 2 or 3.  In this case, the
+optional parts must be omitted.  The form ``exec(expr, globals)`` is equivalent
+to ``exec expr in globals``, while the form ``exec(expr, globals, locals)`` is
+equivalent to ``exec expr in globals, locals``.  The tuple form of ``exec``
+provides compatibility with Python 3, where ``exec`` is a function rather than
+a statement.
+
 .. versionchanged:: 2.4
    Formerly, *locals* was required to be a dictionary.
 
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -61,6 +61,34 @@
         except SyntaxError:
             pass
 
+    def test_exec_functional_style(self):
+        # Exec'ing a tuple of length 2 works.
+        g = {'b': 2}
+        exec("a = b + 1", g)
+        self.assertEqual(g['a'], 3)
+
+        # As does exec'ing a tuple of length 3.
+        l = {'b': 3}
+        g = {'b': 5, 'c': 7}
+        exec("a = b + c", g, l)
+        self.assertNotIn('a', g)
+        self.assertEqual(l['a'], 10)
+
+        # Tuples not of length 2 or 3 are invalid.
+        with self.assertRaises(TypeError):
+            exec("a = b + 1",)
+
+        with self.assertRaises(TypeError):
+            exec("a = b + 1", {}, {}, {})
+
+        # Can't mix and match the two calling forms.
+        g = {'a': 3, 'b': 4}
+        l = {}
+        with self.assertRaises(TypeError):
+            exec("a = b + 1", g) in g
+        with self.assertRaises(TypeError):
+            exec("a = b + 1", g, l) in g, l
+
     def test_exec_with_general_mapping_for_locals(self):
 
         class M:

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

From python-checkins at python.org  Sun Nov 25 15:40:37 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 25 Nov 2012 15:40:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2NTQ2?=
 =?utf-8?q?=3A_make_ast=2EYieldFrom_argument_mandatory=2E?=
Message-ID: <3Y8YpF1v1bzRYj@mail.python.org>

http://hg.python.org/cpython/rev/ffb2fa900cb7
changeset:   80589:ffb2fa900cb7
branch:      3.3
parent:      80586:c9d205e2dd02
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 25 14:36:26 2012 +0000
summary:
  Issue #16546: make ast.YieldFrom argument mandatory.

files:
  Lib/test/test_ast.py |   8 ++++++++
  Misc/NEWS            |   2 ++
  Parser/Python.asdl   |   2 +-
  Python/Python-ast.c  |   8 +++++++-
  Python/ast.c         |   3 +--
  Python/compile.c     |  25 +++++++++++--------------
  Python/symtable.c    |  12 ++++++------
  7 files changed, 36 insertions(+), 24 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
@@ -399,6 +399,14 @@
             compile(m, "<test>", "exec")
         self.assertIn("string must be of type str", str(cm.exception))
 
+    def test_empty_yield_from(self):
+        # Issue 16546: yield from value is not optional.
+        empty_yield_from = ast.parse("def f():\n yield from g()")
+        empty_yield_from.body[0].body[0].value.value = None
+        with self.assertRaises(ValueError) as cm:
+            compile(empty_yield_from, "<test>", "exec")
+        self.assertIn("field value is required", str(cm.exception))
+
 
 class ASTHelpers_Test(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16546: Fix: ast.YieldFrom argument is now mandatory.
+
 - Issue #16514: Fix regression causing a traceback when sys.path[0] is None
   (actually, any non-string or non-bytes type).
 
diff --git a/Parser/Python.asdl b/Parser/Python.asdl
--- a/Parser/Python.asdl
+++ b/Parser/Python.asdl
@@ -60,7 +60,7 @@
          | GeneratorExp(expr elt, comprehension* generators)
          -- the grammar constrains where yield expressions can occur
          | Yield(expr? value)
-             | YieldFrom(expr? value)
+         | YieldFrom(expr value)
          -- need sequences for compare to distinguish between
          -- x < 4 < 3 and (x < 4) < 3
          | Compare(expr left, cmpop* ops, expr* comparators)
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -1802,6 +1802,11 @@
 YieldFrom(expr_ty value, int lineno, int col_offset, PyArena *arena)
 {
         expr_ty p;
+        if (!value) {
+                PyErr_SetString(PyExc_ValueError,
+                                "field value is required for YieldFrom");
+                return NULL;
+        }
         p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
         if (!p)
                 return NULL;
@@ -5431,7 +5436,8 @@
                         Py_XDECREF(tmp);
                         tmp = NULL;
                 } else {
-                        value = NULL;
+                        PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from YieldFrom");
+                        return 1;
                 }
                 *out = YieldFrom(value, lineno, col_offset, arena);
                 if (*out == NULL) goto failed;
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -224,8 +224,7 @@
     case Yield_kind:
         return !exp->v.Yield.value || validate_expr(exp->v.Yield.value, Load);
     case YieldFrom_kind:
-        return !exp->v.YieldFrom.value ||
-            validate_expr(exp->v.YieldFrom.value, Load);
+        return validate_expr(exp->v.YieldFrom.value, Load);
     case Compare_kind:
         if (!asdl_seq_LEN(exp->v.Compare.comparators)) {
             PyErr_SetString(PyExc_ValueError, "Compare with no comparators");
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3341,27 +3341,24 @@
     case DictComp_kind:
         return compiler_dictcomp(c, e);
     case Yield_kind:
-    case YieldFrom_kind: {
-        expr_ty value;
         if (c->u->u_ste->ste_type != FunctionBlock)
             return compiler_error(c, "'yield' outside function");
-        value = (e->kind == YieldFrom_kind) ? e->v.YieldFrom.value : e->v.Yield.value;
-        if (value) {
-            VISIT(c, expr, value);
+        if (e->v.Yield.value) {
+            VISIT(c, expr, e->v.Yield.value);
         }
         else {
             ADDOP_O(c, LOAD_CONST, Py_None, consts);
         }
-        if (e->kind == YieldFrom_kind) {
-            ADDOP(c, GET_ITER);
-            ADDOP_O(c, LOAD_CONST, Py_None, consts);
-            ADDOP(c, YIELD_FROM);
-        }
-        else {
-            ADDOP(c, YIELD_VALUE);
-        }
+        ADDOP(c, YIELD_VALUE);
         break;
-    }
+    case YieldFrom_kind:
+        if (c->u->u_ste->ste_type != FunctionBlock)
+            return compiler_error(c, "'yield' outside function");
+        VISIT(c, expr, e->v.YieldFrom.value);
+        ADDOP(c, GET_ITER);
+        ADDOP_O(c, LOAD_CONST, Py_None, consts);
+        ADDOP(c, YIELD_FROM);
+        break;
     case Compare_kind:
         return compiler_compare(c, e);
     case Call_kind:
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1371,14 +1371,14 @@
             VISIT_QUIT(st, 0);
         break;
     case Yield_kind:
-    case YieldFrom_kind: {
-        expr_ty value;
-        value = (e->kind == YieldFrom_kind) ? e->v.YieldFrom.value : e->v.Yield.value;
-        if (value)
-            VISIT(st, expr, value);
+        if (e->v.Yield.value)
+            VISIT(st, expr, e->v.Yield.value);
         st->st_cur->ste_generator = 1;
         break;
-    }
+    case YieldFrom_kind:
+        VISIT(st, expr, e->v.YieldFrom.value);
+        st->st_cur->ste_generator = 1;
+        break;
     case Compare_kind:
         VISIT(st, expr, e->v.Compare.left);
         VISIT_SEQ(st, expr, e->v.Compare.comparators);

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

From python-checkins at python.org  Sun Nov 25 15:40:38 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 25 Nov 2012 15:40:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316546=3A_merge_fix_from_3=2E3?=
Message-ID: <3Y8YpG5yYrzRZX@mail.python.org>

http://hg.python.org/cpython/rev/9bc6e157475a
changeset:   80590:9bc6e157475a
parent:      80587:aac6b313ef5f
parent:      80589:ffb2fa900cb7
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 25 14:37:43 2012 +0000
summary:
  Issue #16546: merge fix from 3.3

files:
  Lib/test/test_ast.py |   8 ++++++++
  Misc/NEWS            |   2 ++
  Parser/Python.asdl   |   2 +-
  Python/Python-ast.c  |   8 +++++++-
  Python/ast.c         |   3 +--
  Python/compile.c     |  25 +++++++++++--------------
  Python/symtable.c    |  12 ++++++------
  7 files changed, 36 insertions(+), 24 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
@@ -399,6 +399,14 @@
             compile(m, "<test>", "exec")
         self.assertIn("string must be of type str", str(cm.exception))
 
+    def test_empty_yield_from(self):
+        # Issue 16546: yield from value is not optional.
+        empty_yield_from = ast.parse("def f():\n yield from g()")
+        empty_yield_from.body[0].body[0].value.value = None
+        with self.assertRaises(ValueError) as cm:
+            compile(empty_yield_from, "<test>", "exec")
+        self.assertIn("field value is required", str(cm.exception))
+
 
 class ASTHelpers_Test(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16546: Fix: ast.YieldFrom argument is now mandatory.
+
 - Issue #16514: Fix regression causing a traceback when sys.path[0] is None
   (actually, any non-string or non-bytes type).
 
diff --git a/Parser/Python.asdl b/Parser/Python.asdl
--- a/Parser/Python.asdl
+++ b/Parser/Python.asdl
@@ -60,7 +60,7 @@
          | GeneratorExp(expr elt, comprehension* generators)
          -- the grammar constrains where yield expressions can occur
          | Yield(expr? value)
-             | YieldFrom(expr? value)
+         | YieldFrom(expr value)
          -- need sequences for compare to distinguish between
          -- x < 4 < 3 and (x < 4) < 3
          | Compare(expr left, cmpop* ops, expr* comparators)
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -1802,6 +1802,11 @@
 YieldFrom(expr_ty value, int lineno, int col_offset, PyArena *arena)
 {
         expr_ty p;
+        if (!value) {
+                PyErr_SetString(PyExc_ValueError,
+                                "field value is required for YieldFrom");
+                return NULL;
+        }
         p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
         if (!p)
                 return NULL;
@@ -5431,7 +5436,8 @@
                         Py_XDECREF(tmp);
                         tmp = NULL;
                 } else {
-                        value = NULL;
+                        PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from YieldFrom");
+                        return 1;
                 }
                 *out = YieldFrom(value, lineno, col_offset, arena);
                 if (*out == NULL) goto failed;
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -224,8 +224,7 @@
     case Yield_kind:
         return !exp->v.Yield.value || validate_expr(exp->v.Yield.value, Load);
     case YieldFrom_kind:
-        return !exp->v.YieldFrom.value ||
-            validate_expr(exp->v.YieldFrom.value, Load);
+        return validate_expr(exp->v.YieldFrom.value, Load);
     case Compare_kind:
         if (!asdl_seq_LEN(exp->v.Compare.comparators)) {
             PyErr_SetString(PyExc_ValueError, "Compare with no comparators");
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3341,27 +3341,24 @@
     case DictComp_kind:
         return compiler_dictcomp(c, e);
     case Yield_kind:
-    case YieldFrom_kind: {
-        expr_ty value;
         if (c->u->u_ste->ste_type != FunctionBlock)
             return compiler_error(c, "'yield' outside function");
-        value = (e->kind == YieldFrom_kind) ? e->v.YieldFrom.value : e->v.Yield.value;
-        if (value) {
-            VISIT(c, expr, value);
+        if (e->v.Yield.value) {
+            VISIT(c, expr, e->v.Yield.value);
         }
         else {
             ADDOP_O(c, LOAD_CONST, Py_None, consts);
         }
-        if (e->kind == YieldFrom_kind) {
-            ADDOP(c, GET_ITER);
-            ADDOP_O(c, LOAD_CONST, Py_None, consts);
-            ADDOP(c, YIELD_FROM);
-        }
-        else {
-            ADDOP(c, YIELD_VALUE);
-        }
+        ADDOP(c, YIELD_VALUE);
         break;
-    }
+    case YieldFrom_kind:
+        if (c->u->u_ste->ste_type != FunctionBlock)
+            return compiler_error(c, "'yield' outside function");
+        VISIT(c, expr, e->v.YieldFrom.value);
+        ADDOP(c, GET_ITER);
+        ADDOP_O(c, LOAD_CONST, Py_None, consts);
+        ADDOP(c, YIELD_FROM);
+        break;
     case Compare_kind:
         return compiler_compare(c, e);
     case Call_kind:
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1412,14 +1412,14 @@
             VISIT_QUIT(st, 0);
         break;
     case Yield_kind:
-    case YieldFrom_kind: {
-        expr_ty value;
-        value = (e->kind == YieldFrom_kind) ? e->v.YieldFrom.value : e->v.Yield.value;
-        if (value)
-            VISIT(st, expr, value);
+        if (e->v.Yield.value)
+            VISIT(st, expr, e->v.Yield.value);
         st->st_cur->ste_generator = 1;
         break;
-    }
+    case YieldFrom_kind:
+        VISIT(st, expr, e->v.YieldFrom.value);
+        st->st_cur->ste_generator = 1;
+        break;
     case Compare_kind:
         VISIT(st, expr, e->v.Compare.left);
         VISIT_SEQ(st, expr, e->v.Compare.comparators);

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

From python-checkins at python.org  Sun Nov 25 16:17:38 2012
From: python-checkins at python.org (vinay.sajip)
Date: Sun, 25 Nov 2012 16:17:38 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNjUy?=
 =?utf-8?q?1=3A_Improved_error_handling_for_basicConfig=28=29=2C_added_tes?=
 =?utf-8?q?ts_for_same=2E?=
Message-ID: <3Y8Zcy5VQNzRZL@mail.python.org>

http://hg.python.org/cpython/rev/d7660ccd8470
changeset:   80591:d7660ccd8470
branch:      3.2
parent:      80585:55fe4b57dd9c
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sun Nov 25 15:11:46 2012 +0000
summary:
  Closes #16521: Improved error handling for basicConfig(), added tests for same.

files:
  Lib/logging/__init__.py  |   17 +-
  Lib/test/test_logging.py |  160 ++++++++++++++++++++++++++-
  2 files changed, 168 insertions(+), 9 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1674,22 +1674,25 @@
     _acquireLock()
     try:
         if len(root.handlers) == 0:
-            filename = kwargs.get("filename")
+            filename = kwargs.pop("filename", None)
             if filename:
-                mode = kwargs.get("filemode", 'a')
+                mode = kwargs.pop("filemode", 'a')
                 hdlr = FileHandler(filename, mode)
             else:
-                stream = kwargs.get("stream")
+                stream = kwargs.pop("stream", None)
                 hdlr = StreamHandler(stream)
-            fs = kwargs.get("format", BASIC_FORMAT)
-            dfs = kwargs.get("datefmt", None)
-            style = kwargs.get("style", '%')
+            fs = kwargs.pop("format", BASIC_FORMAT)
+            dfs = kwargs.pop("datefmt", None)
+            style = kwargs.pop("style", '%')
             fmt = Formatter(fs, dfs, style)
             hdlr.setFormatter(fmt)
             root.addHandler(hdlr)
-            level = kwargs.get("level")
+            level = kwargs.pop("level", None)
             if level is not None:
                 root.setLevel(level)
+            if kwargs:
+                s = ', '.join(kwargs.keys())
+                raise ValueError('Unexpected in keyword arguments: %s' % s)
     finally:
         _releaseLock()
 
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -41,7 +41,7 @@
 import struct
 import sys
 import tempfile
-from test.support import captured_stdout, run_with_locale, run_unittest
+from test.support import captured_stdout, run_with_locale, run_unittest, patch
 from test.support import TestHandler, Matcher
 import textwrap
 import time
@@ -2367,6 +2367,162 @@
                     os.unlink(fn)
 
 
+class BasicConfigTest(unittest.TestCase):
+
+    """Test suite for logging.basicConfig."""
+
+    def setUp(self):
+        super(BasicConfigTest, self).setUp()
+        self.handlers = logging.root.handlers
+        self.saved_handlers = logging._handlers.copy()
+        self.saved_handler_list = logging._handlerList[:]
+        self.original_logging_level = logging.root.level
+        self.addCleanup(self.cleanup)
+        logging.root.handlers = []
+
+    def tearDown(self):
+        for h in logging.root.handlers[:]:
+            logging.root.removeHandler(h)
+            h.close()
+        super(BasicConfigTest, self).tearDown()
+
+    def cleanup(self):
+        setattr(logging.root, 'handlers', self.handlers)
+        logging._handlers.clear()
+        logging._handlers.update(self.saved_handlers)
+        logging._handlerList[:] = self.saved_handler_list
+        logging.root.level = self.original_logging_level
+
+    def test_no_kwargs(self):
+        logging.basicConfig()
+
+        # handler defaults to a StreamHandler to sys.stderr
+        self.assertEqual(len(logging.root.handlers), 1)
+        handler = logging.root.handlers[0]
+        self.assertIsInstance(handler, logging.StreamHandler)
+        self.assertEqual(handler.stream, sys.stderr)
+
+        formatter = handler.formatter
+        # format defaults to logging.BASIC_FORMAT
+        self.assertEqual(formatter._style._fmt, logging.BASIC_FORMAT)
+        # datefmt defaults to None
+        self.assertIsNone(formatter.datefmt)
+        # style defaults to %
+        self.assertIsInstance(formatter._style, logging.PercentStyle)
+
+        # level is not explicitly set
+        self.assertEqual(logging.root.level, self.original_logging_level)
+
+    def test_filename(self):
+        logging.basicConfig(filename='test.log')
+
+        self.assertEqual(len(logging.root.handlers), 1)
+        handler = logging.root.handlers[0]
+        self.assertIsInstance(handler, logging.FileHandler)
+
+        expected = logging.FileHandler('test.log', 'a')
+        self.addCleanup(expected.close)
+        self.assertEqual(handler.stream.mode, expected.stream.mode)
+        self.assertEqual(handler.stream.name, expected.stream.name)
+
+    def test_filemode(self):
+        logging.basicConfig(filename='test.log', filemode='wb')
+
+        handler = logging.root.handlers[0]
+        expected = logging.FileHandler('test.log', 'wb')
+        self.addCleanup(expected.close)
+        self.assertEqual(handler.stream.mode, expected.stream.mode)
+
+    def test_stream(self):
+        stream = io.StringIO()
+        self.addCleanup(stream.close)
+        logging.basicConfig(stream=stream)
+
+        self.assertEqual(len(logging.root.handlers), 1)
+        handler = logging.root.handlers[0]
+        self.assertIsInstance(handler, logging.StreamHandler)
+        self.assertEqual(handler.stream, stream)
+
+    def test_format(self):
+        logging.basicConfig(format='foo')
+
+        formatter = logging.root.handlers[0].formatter
+        self.assertEqual(formatter._style._fmt, 'foo')
+
+    def test_datefmt(self):
+        logging.basicConfig(datefmt='bar')
+
+        formatter = logging.root.handlers[0].formatter
+        self.assertEqual(formatter.datefmt, 'bar')
+
+    def test_style(self):
+        logging.basicConfig(style='$')
+
+        formatter = logging.root.handlers[0].formatter
+        self.assertIsInstance(formatter._style, logging.StringTemplateStyle)
+
+    def test_level(self):
+        old_level = logging.root.level
+        self.addCleanup(logging.root.setLevel, old_level)
+
+        logging.basicConfig(level=57)
+        self.assertEqual(logging.root.level, 57)
+        # Test that second call has no effect
+        logging.basicConfig(level=58)
+        self.assertEqual(logging.root.level, 57)
+
+    def test_handlers(self):
+        handlers = [
+            logging.StreamHandler(),
+            logging.StreamHandler(sys.stdout),
+            logging.StreamHandler(),
+        ]
+        f = logging.Formatter()
+        handlers[2].setFormatter(f)
+        self.assertRaises(ValueError, logging.basicConfig, level=logging.DEBUG,
+                          format='%(asctime)s %(message)s', handlers=handlers)
+
+    def _test_log(self, method, level=None):
+        # logging.root has no handlers so basicConfig should be called
+        called = []
+
+        old_basic_config = logging.basicConfig
+        def my_basic_config(*a, **kw):
+            old_basic_config()
+            old_level = logging.root.level
+            logging.root.setLevel(100)  # avoid having messages in stderr
+            self.addCleanup(logging.root.setLevel, old_level)
+            called.append((a, kw))
+
+        patch(self, logging, 'basicConfig', my_basic_config)
+
+        log_method = getattr(logging, method)
+        if level is not None:
+            log_method(level, "test me")
+        else:
+            log_method("test me")
+
+        # basicConfig was called with no arguments
+        self.assertEqual(called, [((), {})])
+
+    def test_log(self):
+        self._test_log('log', logging.WARNING)
+
+    def test_debug(self):
+        self._test_log('debug')
+
+    def test_info(self):
+        self._test_log('info')
+
+    def test_warning(self):
+        self._test_log('warning')
+
+    def test_error(self):
+        self._test_log('error')
+
+    def test_critical(self):
+        self._test_log('critical')
+
 # Set the locale to the platform-dependent default.  I have no idea
 # why the test does this, but in any case we save the current locale
 # first and restore it at the end.
@@ -2380,7 +2536,7 @@
                  LogRecordFactoryTest, ChildLoggerTest, QueueHandlerTest,
                  RotatingFileHandlerTest,
                  LastResortTest,
-                 TimedRotatingFileHandlerTest, HandlerTest,
+                 TimedRotatingFileHandlerTest, HandlerTest, BasicConfigTest,
                 )
 
 if __name__ == "__main__":

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

From python-checkins at python.org  Sun Nov 25 16:17:40 2012
From: python-checkins at python.org (vinay.sajip)
Date: Sun, 25 Nov 2012 16:17:40 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Null_merge_for_fix_for_=2316521=2E?=
Message-ID: <3Y8Zd01497zRZW@mail.python.org>

http://hg.python.org/cpython/rev/4b522a1c9c27
changeset:   80592:4b522a1c9c27
branch:      3.3
parent:      80589:ffb2fa900cb7
parent:      80591:d7660ccd8470
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sun Nov 25 15:17:01 2012 +0000
summary:
  Null merge for fix for #16521.

files:



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

From python-checkins at python.org  Sun Nov 25 18:11:44 2012
From: python-checkins at python.org (mark.dickinson)
Date: Sun, 25 Nov 2012 18:11:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzkwMTE6?=
 =?utf-8?q?_AST_creation_no_longer_modifies_CST_for_negated_numeric_litera?=
 =?utf-8?b?bHMu?=
Message-ID: <3Y8d8c690fzRVh@mail.python.org>

http://hg.python.org/cpython/rev/ea36de7926f8
changeset:   80593:ea36de7926f8
branch:      2.7
parent:      80588:fd9c9579050d
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sun Nov 25 17:11:33 2012 +0000
summary:
  Issue #9011: AST creation no longer modifies CST for negated numeric literals.

files:
  Lib/test/test_parser.py |  11 +++++++++++
  Misc/NEWS               |   3 +++
  Python/ast.c            |  25 +++++++++++++++----------
  3 files changed, 29 insertions(+), 10 deletions(-)


diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -567,6 +567,17 @@
         st = parser.suite('a = u"\u1"')
         self.assertRaises(SyntaxError, parser.compilest, st)
 
+    def test_issue_9011(self):
+        # Issue 9011: compilation of an unary minus expression changed
+        # the meaning of the ST, so that a second compilation produced
+        # incorrect results.
+        st = parser.expr('-3')
+        code1 = parser.compilest(st)
+        self.assertEqual(eval(code1), -3)
+        code2 = parser.compilest(st)
+        self.assertEqual(eval(code2), -3)
+
+
 class ParserStackLimitTestCase(unittest.TestCase):
     """try to push the parser to/over it's limits.
     see http://bugs.python.org/issue1881 for a discussion
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9011: Fix hacky AST code that modified the CST when compiling
+  a negated numeric literal.
+
 - Issue #16306: Fix multiple error messages when unknown command line
   parameters where passed to the interpreter.  Patch by Hieu Nguyen.
 
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -930,7 +930,7 @@
       return NULL;
 
     assert(TYPE(CHILD(n, 1)) == funcdef ||
-	   TYPE(CHILD(n, 1)) == classdef);
+           TYPE(CHILD(n, 1)) == classdef);
 
     if (TYPE(CHILD(n, 1)) == funcdef) {
       thing = ast_for_funcdef(c, CHILD(n, 1), decorator_seq);
@@ -1744,14 +1744,19 @@
         NCH(ppower) == 1 &&
         TYPE((patom = CHILD(ppower, 0))) == atom &&
         TYPE((pnum = CHILD(patom, 0))) == NUMBER) {
+        PyObject *pynum;
         char *s = PyObject_MALLOC(strlen(STR(pnum)) + 2);
         if (s == NULL)
             return NULL;
         s[0] = '-';
         strcpy(s + 1, STR(pnum));
-        PyObject_FREE(STR(pnum));
-        STR(pnum) = s;
-        return ast_for_atom(c, patom);
+        pynum = parsenumber(c, s);
+        PyObject_FREE(s);
+        if (!pynum)
+            return NULL;
+
+        PyArena_AddPyObject(c->c_arena, pynum);
+        return Num(pynum, LINENO(n), n->n_col_offset, c->c_arena);
     }
 
     expression = ast_for_expr(c, CHILD(n, 1));
@@ -3292,8 +3297,8 @@
                 return ast_for_funcdef(c, ch, NULL);
             case classdef:
                 return ast_for_classdef(c, ch, NULL);
-	    case decorated:
-	        return ast_for_decorated(c, ch);
+            case decorated:
+                return ast_for_decorated(c, ch);
             default:
                 PyErr_Format(PyExc_SystemError,
                              "unhandled small_stmt: TYPE=%d NCH=%d\n",
@@ -3382,8 +3387,8 @@
                 /* check for integer overflow */
                 if (len > PY_SIZE_MAX / 6)
                         return NULL;
-		/* "<C3><A4>" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5
-		   "\?" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */
+                /* "<C3><A4>" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5
+                   "\?" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */
                 u = PyString_FromStringAndSize((char *)NULL, len * 6);
                 if (u == NULL)
                         return NULL;
@@ -3413,8 +3418,8 @@
                                         sprintf(p, "\\U%02x%02x%02x%02x",
                                                 r[i + 0] & 0xFF,
                                                 r[i + 1] & 0xFF,
-						r[i + 2] & 0xFF,
-						r[i + 3] & 0xFF);
+                                                r[i + 2] & 0xFF,
+                                                r[i + 3] & 0xFF);
                                         p += 10;
                                 }
                                 Py_DECREF(w);

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

From python-checkins at python.org  Mon Nov 26 05:45:08 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 26 Nov 2012 05:45:08 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Add_hyperlinks?=
 =?utf-8?q?_to_the_docs_of_some_os=2Epath_functions_=28issue_=2316552=29?=
 =?utf-8?q?=2E?=
Message-ID: <3Y8wXh0fNTzQ7C@mail.python.org>

http://hg.python.org/cpython/rev/580ca5c587f6
changeset:   80594:580ca5c587f6
branch:      2.7
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Nov 25 20:35:23 2012 -0800
summary:
  Add hyperlinks to the docs of some os.path functions (issue #16552).

files:
  Doc/library/os.path.rst |  15 +++++++++------
  1 files changed, 9 insertions(+), 6 deletions(-)


diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -35,15 +35,17 @@
 .. function:: abspath(path)
 
    Return a normalized absolutized version of the pathname *path*. On most
-   platforms, this is equivalent to ``normpath(join(os.getcwd(), path))``.
+   platforms, this is equivalent to calling the function :func:`normpath` as
+   follows: ``normpath(join(os.getcwd(), path))``.
 
    .. versionadded:: 1.5.2
 
 
 .. function:: basename(path)
 
-   Return the base name of pathname *path*.  This is the second half of the pair
-   returned by ``split(path)``.  Note that the result of this function is different
+   Return the base name of pathname *path*.  This is the second element of the
+   pair returned by passing *path* to the function :func:`split`.  Note that
+   the result of this function is different
    from the Unix :program:`basename` program; where :program:`basename` for
    ``'/foo/bar/'`` returns ``'bar'``, the :func:`basename` function returns an
    empty string (``''``).
@@ -58,8 +60,8 @@
 
 .. function:: dirname(path)
 
-   Return the directory name of pathname *path*.  This is the first half of the
-   pair returned by ``split(path)``.
+   Return the directory name of pathname *path*.  This is the first element of
+   the pair returned by passing *path* to the function :func:`split`.
 
 
 .. function:: exists(path)
@@ -276,7 +278,8 @@
    *path* is empty, both *head* and *tail* are empty.  Trailing slashes are
    stripped from *head* unless it is the root (one or more slashes only).  In
    all cases, ``join(head, tail)`` returns a path to the same location as *path*
-   (but the strings may differ).
+   (but the strings may differ).  Also see the functions :func:`dirname` and
+   :func:`basename`.
 
 
 .. function:: splitdrive(path)

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

From python-checkins at python.org  Mon Nov 26 05:45:09 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 26 Nov 2012 05:45:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Add_hyperlinks?=
 =?utf-8?q?_to_the_docs_of_some_os=2Epath_functions_=28issue_=2316552=29?=
 =?utf-8?q?=2E?=
Message-ID: <3Y8wXj3D4DzRJK@mail.python.org>

http://hg.python.org/cpython/rev/cde59c6acf98
changeset:   80595:cde59c6acf98
branch:      3.2
parent:      80591:d7660ccd8470
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Nov 25 20:38:01 2012 -0800
summary:
  Add hyperlinks to the docs of some os.path functions (issue #16552).

files:
  Doc/library/os.path.rst |  15 +++++++++------
  1 files changed, 9 insertions(+), 6 deletions(-)


diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -43,13 +43,15 @@
 .. function:: abspath(path)
 
    Return a normalized absolutized version of the pathname *path*. On most
-   platforms, this is equivalent to ``normpath(join(os.getcwd(), path))``.
+   platforms, this is equivalent to calling the function :func:`normpath` as
+   follows: ``normpath(join(os.getcwd(), path))``.
 
 
 .. function:: basename(path)
 
-   Return the base name of pathname *path*.  This is the second half of the pair
-   returned by ``split(path)``.  Note that the result of this function is different
+   Return the base name of pathname *path*.  This is the second element of the
+   pair returned by passing *path* to the function :func:`split`.  Note that
+   the result of this function is different
    from the Unix :program:`basename` program; where :program:`basename` for
    ``'/foo/bar/'`` returns ``'bar'``, the :func:`basename` function returns an
    empty string (``''``).
@@ -64,8 +66,8 @@
 
 .. function:: dirname(path)
 
-   Return the directory name of pathname *path*.  This is the first half of the
-   pair returned by ``split(path)``.
+   Return the directory name of pathname *path*.  This is the first element of
+   the pair returned by passing *path* to the function :func:`split`.
 
 
 .. function:: exists(path)
@@ -276,7 +278,8 @@
    *path* is empty, both *head* and *tail* are empty.  Trailing slashes are
    stripped from *head* unless it is the root (one or more slashes only).  In
    all cases, ``join(head, tail)`` returns a path to the same location as *path*
-   (but the strings may differ).
+   (but the strings may differ).  Also see the functions :func:`dirname` and
+   :func:`basename`.
 
 
 .. function:: splitdrive(path)

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

From python-checkins at python.org  Mon Nov 26 05:45:10 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 26 Nov 2012 05:45:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_from_3=2E2=3A_add_hyperlinks_to_some_os=2Epath_function_?=
 =?utf-8?q?docs_=28issue_=2316552=29=2E?=
Message-ID: <3Y8wXk5Vx1zRHj@mail.python.org>

http://hg.python.org/cpython/rev/3eec2d562df0
changeset:   80596:3eec2d562df0
branch:      3.3
parent:      80592:4b522a1c9c27
parent:      80595:cde59c6acf98
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Nov 25 20:40:57 2012 -0800
summary:
  Merge from 3.2: add hyperlinks to some os.path function docs (issue #16552).

files:
  Doc/library/os.path.rst |  15 +++++++++------
  1 files changed, 9 insertions(+), 6 deletions(-)


diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -43,13 +43,15 @@
 .. function:: abspath(path)
 
    Return a normalized absolutized version of the pathname *path*. On most
-   platforms, this is equivalent to ``normpath(join(os.getcwd(), path))``.
+   platforms, this is equivalent to calling the function :func:`normpath` as
+   follows: ``normpath(join(os.getcwd(), path))``.
 
 
 .. function:: basename(path)
 
-   Return the base name of pathname *path*.  This is the second half of the pair
-   returned by ``split(path)``.  Note that the result of this function is different
+   Return the base name of pathname *path*.  This is the second element of the
+   pair returned by passing *path* to the function :func:`split`.  Note that
+   the result of this function is different
    from the Unix :program:`basename` program; where :program:`basename` for
    ``'/foo/bar/'`` returns ``'bar'``, the :func:`basename` function returns an
    empty string (``''``).
@@ -64,8 +66,8 @@
 
 .. function:: dirname(path)
 
-   Return the directory name of pathname *path*.  This is the first half of the
-   pair returned by ``split(path)``.
+   Return the directory name of pathname *path*.  This is the first element of
+   the pair returned by passing *path* to the function :func:`split`.
 
 
 .. function:: exists(path)
@@ -282,7 +284,8 @@
    *path* is empty, both *head* and *tail* are empty.  Trailing slashes are
    stripped from *head* unless it is the root (one or more slashes only).  In
    all cases, ``join(head, tail)`` returns a path to the same location as *path*
-   (but the strings may differ).
+   (but the strings may differ).  Also see the functions :func:`dirname` and
+   :func:`basename`.
 
 
 .. function:: splitdrive(path)

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

From python-checkins at python.org  Mon Nov 26 05:45:12 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Mon, 26 Nov 2012 05:45:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_add_hyperlinks_to_some_os=2Epath_fun?=
 =?utf-8?q?ction_docs_=28issue_=2316552=29=2E?=
Message-ID: <3Y8wXm0kTkzRKM@mail.python.org>

http://hg.python.org/cpython/rev/25321e2172ad
changeset:   80597:25321e2172ad
parent:      80590:9bc6e157475a
parent:      80596:3eec2d562df0
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Nov 25 20:42:00 2012 -0800
summary:
  Merge from 3.3: add hyperlinks to some os.path function docs (issue #16552).

files:
  Doc/library/os.path.rst |  15 +++++++++------
  1 files changed, 9 insertions(+), 6 deletions(-)


diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -42,13 +42,15 @@
 .. function:: abspath(path)
 
    Return a normalized absolutized version of the pathname *path*. On most
-   platforms, this is equivalent to ``normpath(join(os.getcwd(), path))``.
+   platforms, this is equivalent to calling the function :func:`normpath` as
+   follows: ``normpath(join(os.getcwd(), path))``.
 
 
 .. function:: basename(path)
 
-   Return the base name of pathname *path*.  This is the second half of the pair
-   returned by ``split(path)``.  Note that the result of this function is different
+   Return the base name of pathname *path*.  This is the second element of the
+   pair returned by passing *path* to the function :func:`split`.  Note that
+   the result of this function is different
    from the Unix :program:`basename` program; where :program:`basename` for
    ``'/foo/bar/'`` returns ``'bar'``, the :func:`basename` function returns an
    empty string (``''``).
@@ -63,8 +65,8 @@
 
 .. function:: dirname(path)
 
-   Return the directory name of pathname *path*.  This is the first half of the
-   pair returned by ``split(path)``.
+   Return the directory name of pathname *path*.  This is the first element of
+   the pair returned by passing *path* to the function :func:`split`.
 
 
 .. function:: exists(path)
@@ -281,7 +283,8 @@
    *path* is empty, both *head* and *tail* are empty.  Trailing slashes are
    stripped from *head* unless it is the root (one or more slashes only).  In
    all cases, ``join(head, tail)`` returns a path to the same location as *path*
-   (but the strings may differ).
+   (but the strings may differ).  Also see the functions :func:`dirname` and
+   :func:`basename`.
 
 
 .. function:: splitdrive(path)

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

From solipsis at pitrou.net  Mon Nov 26 05:56:06 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 26 Nov 2012 05:56:06 +0100
Subject: [Python-checkins] Daily reference leaks (9bc6e157475a): sum=0
Message-ID: <E1Tcqjm-0006yd-W5@ap.vmr.nerim.net>

results for 9bc6e157475a on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Mon Nov 26 18:28:10 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 26 Nov 2012 18:28:10 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NTU5OiBBZGQg?=
 =?utf-8?q?more_tests_for_the_json_module=2E__Patch_by_Serhiy_Storchaka=2E?=
Message-ID: <3Y9FT65zZjzQSH@mail.python.org>

http://hg.python.org/cpython/rev/e092ff374721
changeset:   80598:e092ff374721
branch:      2.7
parent:      80594:580ca5c587f6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 26 19:22:58 2012 +0200
summary:
  #16559: Add more tests for the json module.  Patch by Serhiy Storchaka.

files:
  Lib/json/tests/test_fail.py  |  24 +++++++++++++++++++++---
  Lib/json/tests/test_float.py |  15 +++++++++++++++
  Lib/json/tests/test_pass1.py |  20 ++++++++------------
  Misc/NEWS                    |   3 +++
  4 files changed, 47 insertions(+), 15 deletions(-)


diff --git a/Lib/json/tests/test_fail.py b/Lib/json/tests/test_fail.py
--- a/Lib/json/tests/test_fail.py
+++ b/Lib/json/tests/test_fail.py
@@ -1,13 +1,13 @@
 from json.tests import PyTest, CTest
 
-# Fri Dec 30 18:57:26 2005
+# 2007-10-05
 JSONDOCS = [
     # http://json.org/JSON_checker/test/fail1.json
     '"A JSON payload should be an object or array, not a string."',
     # http://json.org/JSON_checker/test/fail2.json
     '["Unclosed array"',
     # http://json.org/JSON_checker/test/fail3.json
-    '{unquoted_key: "keys must be quoted}',
+    '{unquoted_key: "keys must be quoted"}',
     # http://json.org/JSON_checker/test/fail4.json
     '["extra comma",]',
     # http://json.org/JSON_checker/test/fail5.json
@@ -33,7 +33,7 @@
     # http://json.org/JSON_checker/test/fail15.json
     '["Illegal backslash escape: \\x15"]',
     # http://json.org/JSON_checker/test/fail16.json
-    '["Illegal backslash escape: \\\'"]',
+    '[\\naked]',
     # http://json.org/JSON_checker/test/fail17.json
     '["Illegal backslash escape: \\017"]',
     # http://json.org/JSON_checker/test/fail18.json
@@ -50,6 +50,24 @@
     '["Bad value", truth]',
     # http://json.org/JSON_checker/test/fail24.json
     "['single quote']",
+    # http://json.org/JSON_checker/test/fail25.json
+    '["\ttab\tcharacter\tin\tstring\t"]',
+    # http://json.org/JSON_checker/test/fail26.json
+    '["tab\\   character\\   in\\  string\\  "]',
+    # http://json.org/JSON_checker/test/fail27.json
+    '["line\nbreak"]',
+    # http://json.org/JSON_checker/test/fail28.json
+    '["line\\\nbreak"]',
+    # http://json.org/JSON_checker/test/fail29.json
+    '[0e]',
+    # http://json.org/JSON_checker/test/fail30.json
+    '[0e+]',
+    # http://json.org/JSON_checker/test/fail31.json
+    '[0e+-1]',
+    # http://json.org/JSON_checker/test/fail32.json
+    '{"Comma instead if closing brace": true,',
+    # http://json.org/JSON_checker/test/fail33.json
+    '["mismatch"}',
     # http://code.google.com/p/simplejson/issues/detail?id=3
     u'["A\u001FZ control characters in string"]',
 ]
diff --git a/Lib/json/tests/test_float.py b/Lib/json/tests/test_float.py
--- a/Lib/json/tests/test_float.py
+++ b/Lib/json/tests/test_float.py
@@ -17,6 +17,21 @@
             self.assertEqual(self.loads(self.dumps(num)), num)
             self.assertEqual(self.loads(unicode(self.dumps(num))), num)
 
+    def test_out_of_range(self):
+        self.assertEqual(self.loads('[23456789012E666]'), [float('inf')])
+        self.assertEqual(self.loads('[-23456789012E666]'), [float('-inf')])
+
+    def test_allow_nan(self):
+        for val in (float('inf'), float('-inf'), float('nan')):
+            out = self.dumps([val])
+            if val == val:  # inf
+                self.assertEqual(self.loads(out), [val])
+            else:  # nan
+                res = self.loads(out)
+                self.assertEqual(len(res), 1)
+                self.assertNotEqual(res[0], res[0])
+            self.assertRaises(ValueError, self.dumps, [val], allow_nan=False)
+
 
 class TestPyFloat(TestFloat, PyTest): pass
 class TestCFloat(TestFloat, CTest): pass
diff --git a/Lib/json/tests/test_pass1.py b/Lib/json/tests/test_pass1.py
--- a/Lib/json/tests/test_pass1.py
+++ b/Lib/json/tests/test_pass1.py
@@ -17,7 +17,7 @@
         "real": -9876.543210,
         "e": 0.123456789e-12,
         "E": 1.234567890E+34,
-        "":  23456789012E666,
+        "":  23456789012E66,
         "zero": 0,
         "one": 1,
         "space": " ",
@@ -28,6 +28,7 @@
         "alpha": "abcdefghijklmnopqrstuvwyz",
         "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
         "digit": "0123456789",
+        "0123456789": "digit",
         "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
         "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
         "true": true,
@@ -43,8 +44,7 @@
 
 ,
 
-4 , 5        ,          6           ,7        ],
-        "compact": [1,2,3,4,5,6,7],
+4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
         "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
         "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
         "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
@@ -55,9 +55,11 @@
 99.44
 ,
 
-1066
-
-
+1066,
+1e1,
+0.1e1,
+1e-1,
+1e00,2e+00,2e-00
 ,"rosebud"]
 '''
 
@@ -67,12 +69,6 @@
         res = self.loads(JSON)
         out = self.dumps(res)
         self.assertEqual(res, self.loads(out))
-        try:
-            self.dumps(res, allow_nan=False)
-        except ValueError:
-            pass
-        else:
-            self.fail("23456789012E666 should be out of range")
 
 
 class TestPyPass1(TestPass1, PyTest): pass
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -518,6 +518,9 @@
 Tests
 -----
 
+- Issue #16559: Add more tests for the json module, including some from the
+  official test suite at json.org.  Patch by Serhiy Storchaka.
+
 - Issue #16274: Fix test_asyncore on Solaris.  Patch by Giampaolo Rodola'.
 
 - Issue #15040: Close files in mailbox tests for PyPy compatibility.

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

From python-checkins at python.org  Mon Nov 26 18:28:12 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 26 Nov 2012 18:28:12 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NTU5OiBBZGQg?=
 =?utf-8?q?more_tests_for_the_json_module=2E__Patch_by_Serhiy_Storchaka=2E?=
Message-ID: <3Y9FT82k57zQf4@mail.python.org>

http://hg.python.org/cpython/rev/4f21a9b7decf
changeset:   80599:4f21a9b7decf
branch:      3.2
parent:      80595:cde59c6acf98
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 26 19:24:20 2012 +0200
summary:
  #16559: Add more tests for the json module.  Patch by Serhiy Storchaka.

files:
  Lib/test/json_tests/test_fail.py  |  24 ++++++++++++++++--
  Lib/test/json_tests/test_float.py |  15 +++++++++++
  Lib/test/json_tests/test_pass1.py |  20 ++++++---------
  Misc/NEWS                         |   3 ++
  4 files changed, 47 insertions(+), 15 deletions(-)


diff --git a/Lib/test/json_tests/test_fail.py b/Lib/test/json_tests/test_fail.py
--- a/Lib/test/json_tests/test_fail.py
+++ b/Lib/test/json_tests/test_fail.py
@@ -1,13 +1,13 @@
 from test.json_tests import PyTest, CTest
 
-# Fri Dec 30 18:57:26 2005
+# 2007-10-05
 JSONDOCS = [
     # http://json.org/JSON_checker/test/fail1.json
     '"A JSON payload should be an object or array, not a string."',
     # http://json.org/JSON_checker/test/fail2.json
     '["Unclosed array"',
     # http://json.org/JSON_checker/test/fail3.json
-    '{unquoted_key: "keys must be quoted}',
+    '{unquoted_key: "keys must be quoted"}',
     # http://json.org/JSON_checker/test/fail4.json
     '["extra comma",]',
     # http://json.org/JSON_checker/test/fail5.json
@@ -33,7 +33,7 @@
     # http://json.org/JSON_checker/test/fail15.json
     '["Illegal backslash escape: \\x15"]',
     # http://json.org/JSON_checker/test/fail16.json
-    '["Illegal backslash escape: \\\'"]',
+    '[\\naked]',
     # http://json.org/JSON_checker/test/fail17.json
     '["Illegal backslash escape: \\017"]',
     # http://json.org/JSON_checker/test/fail18.json
@@ -50,6 +50,24 @@
     '["Bad value", truth]',
     # http://json.org/JSON_checker/test/fail24.json
     "['single quote']",
+    # http://json.org/JSON_checker/test/fail25.json
+    '["\ttab\tcharacter\tin\tstring\t"]',
+    # http://json.org/JSON_checker/test/fail26.json
+    '["tab\\   character\\   in\\  string\\  "]',
+    # http://json.org/JSON_checker/test/fail27.json
+    '["line\nbreak"]',
+    # http://json.org/JSON_checker/test/fail28.json
+    '["line\\\nbreak"]',
+    # http://json.org/JSON_checker/test/fail29.json
+    '[0e]',
+    # http://json.org/JSON_checker/test/fail30.json
+    '[0e+]',
+    # http://json.org/JSON_checker/test/fail31.json
+    '[0e+-1]',
+    # http://json.org/JSON_checker/test/fail32.json
+    '{"Comma instead if closing brace": true,',
+    # http://json.org/JSON_checker/test/fail33.json
+    '["mismatch"}',
     # http://code.google.com/p/simplejson/issues/detail?id=3
     '["A\u001FZ control characters in string"]',
 ]
diff --git a/Lib/test/json_tests/test_float.py b/Lib/test/json_tests/test_float.py
--- a/Lib/test/json_tests/test_float.py
+++ b/Lib/test/json_tests/test_float.py
@@ -13,6 +13,21 @@
             self.assertEqual(self.dumps(num), str(num))
             self.assertEqual(int(self.dumps(num)), num)
 
+    def test_out_of_range(self):
+        self.assertEqual(self.loads('[23456789012E666]'), [float('inf')])
+        self.assertEqual(self.loads('[-23456789012E666]'), [float('-inf')])
+
+    def test_allow_nan(self):
+        for val in (float('inf'), float('-inf'), float('nan')):
+            out = self.dumps([val])
+            if val == val:  # inf
+                self.assertEqual(self.loads(out), [val])
+            else:  # nan
+                res = self.loads(out)
+                self.assertEqual(len(res), 1)
+                self.assertNotEqual(res[0], res[0])
+            self.assertRaises(ValueError, self.dumps, [val], allow_nan=False)
+
 
 class TestPyFloat(TestFloat, PyTest): pass
 class TestCFloat(TestFloat, CTest): pass
diff --git a/Lib/test/json_tests/test_pass1.py b/Lib/test/json_tests/test_pass1.py
--- a/Lib/test/json_tests/test_pass1.py
+++ b/Lib/test/json_tests/test_pass1.py
@@ -17,7 +17,7 @@
         "real": -9876.543210,
         "e": 0.123456789e-12,
         "E": 1.234567890E+34,
-        "":  23456789012E666,
+        "":  23456789012E66,
         "zero": 0,
         "one": 1,
         "space": " ",
@@ -28,6 +28,7 @@
         "alpha": "abcdefghijklmnopqrstuvwyz",
         "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
         "digit": "0123456789",
+        "0123456789": "digit",
         "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
         "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
         "true": true,
@@ -43,8 +44,7 @@
 
 ,
 
-4 , 5        ,          6           ,7        ],
-        "compact": [1,2,3,4,5,6,7],
+4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
         "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
         "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
         "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
@@ -55,9 +55,11 @@
 99.44
 ,
 
-1066
-
-
+1066,
+1e1,
+0.1e1,
+1e-1,
+1e00,2e+00,2e-00
 ,"rosebud"]
 '''
 
@@ -67,12 +69,6 @@
         res = self.loads(JSON)
         out = self.dumps(res)
         self.assertEqual(res, self.loads(out))
-        try:
-            self.dumps(res, allow_nan=False)
-        except ValueError:
-            pass
-        else:
-            self.fail("23456789012E666 should be out of range")
 
 
 class TestPyPass1(TestPass1, PyTest): pass
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -641,6 +641,9 @@
 Tests
 -----
 
+- Issue #16559: Add more tests for the json module, including some from the
+  official test suite at json.org.  Patch by Serhiy Storchaka.
+
 - Issue #15304: Fix warning message when os.chdir() fails inside
   test.support.temp_cwd().  Patch by Chris Jerdonek.
 

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

From python-checkins at python.org  Mon Nov 26 18:28:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 26 Nov 2012 18:28:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316559=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y9FT96Tj3zRJl@mail.python.org>

http://hg.python.org/cpython/rev/139a8cbca94e
changeset:   80600:139a8cbca94e
branch:      3.3
parent:      80596:3eec2d562df0
parent:      80599:4f21a9b7decf
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 26 19:27:02 2012 +0200
summary:
  #16559: merge with 3.2.

files:
  Lib/test/json_tests/test_fail.py  |  24 ++++++++++++++++--
  Lib/test/json_tests/test_float.py |  15 +++++++++++
  Lib/test/json_tests/test_pass1.py |  20 ++++++---------
  Misc/NEWS                         |   3 ++
  4 files changed, 47 insertions(+), 15 deletions(-)


diff --git a/Lib/test/json_tests/test_fail.py b/Lib/test/json_tests/test_fail.py
--- a/Lib/test/json_tests/test_fail.py
+++ b/Lib/test/json_tests/test_fail.py
@@ -1,13 +1,13 @@
 from test.json_tests import PyTest, CTest
 
-# Fri Dec 30 18:57:26 2005
+# 2007-10-05
 JSONDOCS = [
     # http://json.org/JSON_checker/test/fail1.json
     '"A JSON payload should be an object or array, not a string."',
     # http://json.org/JSON_checker/test/fail2.json
     '["Unclosed array"',
     # http://json.org/JSON_checker/test/fail3.json
-    '{unquoted_key: "keys must be quoted}',
+    '{unquoted_key: "keys must be quoted"}',
     # http://json.org/JSON_checker/test/fail4.json
     '["extra comma",]',
     # http://json.org/JSON_checker/test/fail5.json
@@ -33,7 +33,7 @@
     # http://json.org/JSON_checker/test/fail15.json
     '["Illegal backslash escape: \\x15"]',
     # http://json.org/JSON_checker/test/fail16.json
-    '["Illegal backslash escape: \\\'"]',
+    '[\\naked]',
     # http://json.org/JSON_checker/test/fail17.json
     '["Illegal backslash escape: \\017"]',
     # http://json.org/JSON_checker/test/fail18.json
@@ -50,6 +50,24 @@
     '["Bad value", truth]',
     # http://json.org/JSON_checker/test/fail24.json
     "['single quote']",
+    # http://json.org/JSON_checker/test/fail25.json
+    '["\ttab\tcharacter\tin\tstring\t"]',
+    # http://json.org/JSON_checker/test/fail26.json
+    '["tab\\   character\\   in\\  string\\  "]',
+    # http://json.org/JSON_checker/test/fail27.json
+    '["line\nbreak"]',
+    # http://json.org/JSON_checker/test/fail28.json
+    '["line\\\nbreak"]',
+    # http://json.org/JSON_checker/test/fail29.json
+    '[0e]',
+    # http://json.org/JSON_checker/test/fail30.json
+    '[0e+]',
+    # http://json.org/JSON_checker/test/fail31.json
+    '[0e+-1]',
+    # http://json.org/JSON_checker/test/fail32.json
+    '{"Comma instead if closing brace": true,',
+    # http://json.org/JSON_checker/test/fail33.json
+    '["mismatch"}',
     # http://code.google.com/p/simplejson/issues/detail?id=3
     '["A\u001FZ control characters in string"]',
 ]
diff --git a/Lib/test/json_tests/test_float.py b/Lib/test/json_tests/test_float.py
--- a/Lib/test/json_tests/test_float.py
+++ b/Lib/test/json_tests/test_float.py
@@ -13,6 +13,21 @@
             self.assertEqual(self.dumps(num), str(num))
             self.assertEqual(int(self.dumps(num)), num)
 
+    def test_out_of_range(self):
+        self.assertEqual(self.loads('[23456789012E666]'), [float('inf')])
+        self.assertEqual(self.loads('[-23456789012E666]'), [float('-inf')])
+
+    def test_allow_nan(self):
+        for val in (float('inf'), float('-inf'), float('nan')):
+            out = self.dumps([val])
+            if val == val:  # inf
+                self.assertEqual(self.loads(out), [val])
+            else:  # nan
+                res = self.loads(out)
+                self.assertEqual(len(res), 1)
+                self.assertNotEqual(res[0], res[0])
+            self.assertRaises(ValueError, self.dumps, [val], allow_nan=False)
+
 
 class TestPyFloat(TestFloat, PyTest): pass
 class TestCFloat(TestFloat, CTest): pass
diff --git a/Lib/test/json_tests/test_pass1.py b/Lib/test/json_tests/test_pass1.py
--- a/Lib/test/json_tests/test_pass1.py
+++ b/Lib/test/json_tests/test_pass1.py
@@ -17,7 +17,7 @@
         "real": -9876.543210,
         "e": 0.123456789e-12,
         "E": 1.234567890E+34,
-        "":  23456789012E666,
+        "":  23456789012E66,
         "zero": 0,
         "one": 1,
         "space": " ",
@@ -28,6 +28,7 @@
         "alpha": "abcdefghijklmnopqrstuvwyz",
         "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
         "digit": "0123456789",
+        "0123456789": "digit",
         "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
         "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
         "true": true,
@@ -43,8 +44,7 @@
 
 ,
 
-4 , 5        ,          6           ,7        ],
-        "compact": [1,2,3,4,5,6,7],
+4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
         "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
         "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
         "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
@@ -55,9 +55,11 @@
 99.44
 ,
 
-1066
-
-
+1066,
+1e1,
+0.1e1,
+1e-1,
+1e00,2e+00,2e-00
 ,"rosebud"]
 '''
 
@@ -67,12 +69,6 @@
         res = self.loads(JSON)
         out = self.dumps(res)
         self.assertEqual(res, self.loads(out))
-        try:
-            self.dumps(res, allow_nan=False)
-        except ValueError:
-            pass
-        else:
-            self.fail("23456789012E666 should be out of range")
 
 
 class TestPyPass1(TestPass1, PyTest): pass
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -250,6 +250,9 @@
 Tests
 -----
 
+- Issue #16559: Add more tests for the json module, including some from the
+  official test suite at json.org.  Patch by Serhiy Storchaka.
+
 - Issue #16115: Add some tests for the executable argument to
   subprocess.Popen().  Initial patch by Kushal Das.
 

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

From python-checkins at python.org  Mon Nov 26 18:28:15 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 26 Nov 2012 18:28:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NTU5OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y9FTC2tFnzR5L@mail.python.org>

http://hg.python.org/cpython/rev/a5b3eb62311e
changeset:   80601:a5b3eb62311e
parent:      80597:25321e2172ad
parent:      80600:139a8cbca94e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Nov 26 19:27:58 2012 +0200
summary:
  #16559: merge with 3.3.

files:
  Lib/test/json_tests/test_fail.py  |  24 ++++++++++++++++--
  Lib/test/json_tests/test_float.py |  15 +++++++++++
  Lib/test/json_tests/test_pass1.py |  20 ++++++---------
  Misc/NEWS                         |   3 ++
  4 files changed, 47 insertions(+), 15 deletions(-)


diff --git a/Lib/test/json_tests/test_fail.py b/Lib/test/json_tests/test_fail.py
--- a/Lib/test/json_tests/test_fail.py
+++ b/Lib/test/json_tests/test_fail.py
@@ -1,13 +1,13 @@
 from test.json_tests import PyTest, CTest
 
-# Fri Dec 30 18:57:26 2005
+# 2007-10-05
 JSONDOCS = [
     # http://json.org/JSON_checker/test/fail1.json
     '"A JSON payload should be an object or array, not a string."',
     # http://json.org/JSON_checker/test/fail2.json
     '["Unclosed array"',
     # http://json.org/JSON_checker/test/fail3.json
-    '{unquoted_key: "keys must be quoted}',
+    '{unquoted_key: "keys must be quoted"}',
     # http://json.org/JSON_checker/test/fail4.json
     '["extra comma",]',
     # http://json.org/JSON_checker/test/fail5.json
@@ -33,7 +33,7 @@
     # http://json.org/JSON_checker/test/fail15.json
     '["Illegal backslash escape: \\x15"]',
     # http://json.org/JSON_checker/test/fail16.json
-    '["Illegal backslash escape: \\\'"]',
+    '[\\naked]',
     # http://json.org/JSON_checker/test/fail17.json
     '["Illegal backslash escape: \\017"]',
     # http://json.org/JSON_checker/test/fail18.json
@@ -50,6 +50,24 @@
     '["Bad value", truth]',
     # http://json.org/JSON_checker/test/fail24.json
     "['single quote']",
+    # http://json.org/JSON_checker/test/fail25.json
+    '["\ttab\tcharacter\tin\tstring\t"]',
+    # http://json.org/JSON_checker/test/fail26.json
+    '["tab\\   character\\   in\\  string\\  "]',
+    # http://json.org/JSON_checker/test/fail27.json
+    '["line\nbreak"]',
+    # http://json.org/JSON_checker/test/fail28.json
+    '["line\\\nbreak"]',
+    # http://json.org/JSON_checker/test/fail29.json
+    '[0e]',
+    # http://json.org/JSON_checker/test/fail30.json
+    '[0e+]',
+    # http://json.org/JSON_checker/test/fail31.json
+    '[0e+-1]',
+    # http://json.org/JSON_checker/test/fail32.json
+    '{"Comma instead if closing brace": true,',
+    # http://json.org/JSON_checker/test/fail33.json
+    '["mismatch"}',
     # http://code.google.com/p/simplejson/issues/detail?id=3
     '["A\u001FZ control characters in string"]',
 ]
diff --git a/Lib/test/json_tests/test_float.py b/Lib/test/json_tests/test_float.py
--- a/Lib/test/json_tests/test_float.py
+++ b/Lib/test/json_tests/test_float.py
@@ -13,6 +13,21 @@
             self.assertEqual(self.dumps(num), str(num))
             self.assertEqual(int(self.dumps(num)), num)
 
+    def test_out_of_range(self):
+        self.assertEqual(self.loads('[23456789012E666]'), [float('inf')])
+        self.assertEqual(self.loads('[-23456789012E666]'), [float('-inf')])
+
+    def test_allow_nan(self):
+        for val in (float('inf'), float('-inf'), float('nan')):
+            out = self.dumps([val])
+            if val == val:  # inf
+                self.assertEqual(self.loads(out), [val])
+            else:  # nan
+                res = self.loads(out)
+                self.assertEqual(len(res), 1)
+                self.assertNotEqual(res[0], res[0])
+            self.assertRaises(ValueError, self.dumps, [val], allow_nan=False)
+
 
 class TestPyFloat(TestFloat, PyTest): pass
 class TestCFloat(TestFloat, CTest): pass
diff --git a/Lib/test/json_tests/test_pass1.py b/Lib/test/json_tests/test_pass1.py
--- a/Lib/test/json_tests/test_pass1.py
+++ b/Lib/test/json_tests/test_pass1.py
@@ -17,7 +17,7 @@
         "real": -9876.543210,
         "e": 0.123456789e-12,
         "E": 1.234567890E+34,
-        "":  23456789012E666,
+        "":  23456789012E66,
         "zero": 0,
         "one": 1,
         "space": " ",
@@ -28,6 +28,7 @@
         "alpha": "abcdefghijklmnopqrstuvwyz",
         "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
         "digit": "0123456789",
+        "0123456789": "digit",
         "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
         "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
         "true": true,
@@ -43,8 +44,7 @@
 
 ,
 
-4 , 5        ,          6           ,7        ],
-        "compact": [1,2,3,4,5,6,7],
+4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
         "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
         "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
         "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
@@ -55,9 +55,11 @@
 99.44
 ,
 
-1066
-
-
+1066,
+1e1,
+0.1e1,
+1e-1,
+1e00,2e+00,2e-00
 ,"rosebud"]
 '''
 
@@ -67,12 +69,6 @@
         res = self.loads(JSON)
         out = self.dumps(res)
         self.assertEqual(res, self.loads(out))
-        try:
-            self.dumps(res, allow_nan=False)
-        except ValueError:
-            pass
-        else:
-            self.fail("23456789012E666 should be out of range")
 
 
 class TestPyPass1(TestPass1, PyTest): pass
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -380,6 +380,9 @@
 Tests
 -----
 
+- Issue #16559: Add more tests for the json module, including some from the
+  official test suite at json.org.  Patch by Serhiy Storchaka.
+
 - Issue #16115: Add some tests for the executable argument to
   subprocess.Popen().  Initial patch by Kushal Das.
 

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

From solipsis at pitrou.net  Tue Nov 27 06:00:29 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 27 Nov 2012 06:00:29 +0100
Subject: [Python-checkins] Daily reference leaks (a5b3eb62311e): sum=0
Message-ID: <E1TdDHZ-0007B7-Js@ap.vmr.nerim.net>

results for a5b3eb62311e on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Tue Nov 27 18:19:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 27 Nov 2012 18:19:14 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NTU2OiBGaXgg?=
 =?utf-8?q?inconsistency_between_kwds_and_kwargs=2E__Patch_by_Taavi_Burns?=
 =?utf-8?q?=2E?=
Message-ID: <3Y9sDL6ZN4zRQX@mail.python.org>

http://hg.python.org/cpython/rev/d805982336a0
changeset:   80602:d805982336a0
branch:      2.7
parent:      80598:e092ff374721
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Nov 27 19:17:57 2012 +0200
summary:
  #16556: Fix inconsistency between kwds and kwargs.  Patch by Taavi Burns.

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


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -132,7 +132,7 @@
       This function does the actual work of formatting.  It is exposed as a
       separate function for cases where you want to pass in a predefined
       dictionary of arguments, rather than unpacking and repacking the
-      dictionary as individual arguments using the ``*args`` and ``**kwds``
+      dictionary as individual arguments using the ``*args`` and ``**kwargs``
       syntax.  :meth:`vformat` does the work of breaking up the format string
       into character data and replacement fields.  It calls the various
       methods described below.

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

From python-checkins at python.org  Tue Nov 27 18:19:16 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 27 Nov 2012 18:19:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NTU2OiBGaXgg?=
 =?utf-8?q?inconsistency_between_kwds_and_kwargs=2E__Patch_by_Taavi_Burns?=
 =?utf-8?q?=2E?=
Message-ID: <3Y9sDN1ph5zRVF@mail.python.org>

http://hg.python.org/cpython/rev/565c3bbed7d3
changeset:   80603:565c3bbed7d3
branch:      3.2
parent:      80599:4f21a9b7decf
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Nov 27 19:17:57 2012 +0200
summary:
  #16556: Fix inconsistency between kwds and kwargs.  Patch by Taavi Burns.

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


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -100,7 +100,7 @@
       This function does the actual work of formatting.  It is exposed as a
       separate function for cases where you want to pass in a predefined
       dictionary of arguments, rather than unpacking and repacking the
-      dictionary as individual arguments using the ``*args`` and ``**kwds``
+      dictionary as individual arguments using the ``*args`` and ``**kwargs``
       syntax.  :meth:`vformat` does the work of breaking up the format string
       into character data and replacement fields.  It calls the various
       methods described below.

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

From python-checkins at python.org  Tue Nov 27 18:19:17 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 27 Nov 2012 18:19:17 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316556=3A_merge_with_3=2E2=2E?=
Message-ID: <3Y9sDP42MTzRWk@mail.python.org>

http://hg.python.org/cpython/rev/ae19d86b71c8
changeset:   80604:ae19d86b71c8
branch:      3.3
parent:      80600:139a8cbca94e
parent:      80603:565c3bbed7d3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Nov 27 19:18:47 2012 +0200
summary:
  #16556: merge with 3.2.

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


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -100,7 +100,7 @@
       This function does the actual work of formatting.  It is exposed as a
       separate function for cases where you want to pass in a predefined
       dictionary of arguments, rather than unpacking and repacking the
-      dictionary as individual arguments using the ``*args`` and ``**kwds``
+      dictionary as individual arguments using the ``*args`` and ``**kwargs``
       syntax.  :meth:`vformat` does the work of breaking up the format string
       into character data and replacement fields.  It calls the various
       methods described below.

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

From python-checkins at python.org  Tue Nov 27 18:19:18 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 27 Nov 2012 18:19:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NTU2OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3Y9sDQ6YSGzRWw@mail.python.org>

http://hg.python.org/cpython/rev/c28f593ea0cb
changeset:   80605:c28f593ea0cb
parent:      80601:a5b3eb62311e
parent:      80604:ae19d86b71c8
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Nov 27 19:19:01 2012 +0200
summary:
  #16556: merge with 3.3.

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


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -100,7 +100,7 @@
       This function does the actual work of formatting.  It is exposed as a
       separate function for cases where you want to pass in a predefined
       dictionary of arguments, rather than unpacking and repacking the
-      dictionary as individual arguments using the ``*args`` and ``**kwds``
+      dictionary as individual arguments using the ``*args`` and ``**kwargs``
       syntax.  :meth:`vformat` does the work of breaking up the format string
       into character data and replacement fields.  It calls the various
       methods described below.

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

From python-checkins at python.org  Tue Nov 27 19:17:09 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Tue, 27 Nov 2012 19:17:09 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Plug_a_leak_in?=
 =?utf-8?q?_timemodule=2E_The_module_dictionary_is_saved_during?=
Message-ID: <3Y9tW92L9lzRPW@mail.python.org>

http://hg.python.org/cpython/rev/478492476b1f
changeset:   80606:478492476b1f
branch:      3.2
parent:      80603:565c3bbed7d3
user:        Gregory P. Smith <greg at krypto.org>
date:        Tue Nov 27 10:16:55 2012 -0800
summary:
  Plug a leak in timemodule. The module dictionary is saved during
initialization. If the interpreter is shut down and reinitialized (embedded
CPython), the old module dictionary was not dec-refed during the next import of
the time extension module.

Contributed by Torsten Marek of Google.

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -620,6 +620,9 @@
 Extension Modules
 -----------------
 
+- Fix the leak of a dict in the time module when used in an embedded
+  interpreter that is repeatedly initialized and shutdown and reinitialized.
+
 - Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
   method doesn't require an argument again.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -63,7 +63,7 @@
 static double floattime(void);
 
 /* For Y2K check */
-static PyObject *moddict;
+static PyObject *moddict = NULL;
 
 static PyObject *
 time_time(PyObject *self, PyObject *unused)
@@ -941,6 +941,11 @@
     /* Accept 2-digit dates unless PYTHONY2K is set and non-empty */
     p = Py_GETENV("PYTHONY2K");
     PyModule_AddIntConstant(m, "accept2dyear", (long) (!p || !*p));
+    /* If an embedded interpreter is shutdown and reinitialized the old
+       moddict was not decrefed on shutdown and the next import of this
+       module leads to a leak.  Conditionally decref here to prevent that.
+    */
+    Py_XDECREF(moddict);
     /* Squirrel away the module's dictionary for the y2k check */
     moddict = PyModule_GetDict(m);
     Py_INCREF(moddict);

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

From python-checkins at python.org  Tue Nov 27 19:19:00 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Tue, 27 Nov 2012 19:19:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_null_merge_=283=2E3_is_different=29?=
Message-ID: <3Y9tYJ5qnTzRPW@mail.python.org>

http://hg.python.org/cpython/rev/218a4fefc7b2
changeset:   80607:218a4fefc7b2
branch:      3.3
parent:      80604:ae19d86b71c8
parent:      80606:478492476b1f
user:        Gregory P. Smith <greg at krypto.org>
date:        Tue Nov 27 10:18:40 2012 -0800
summary:
  null merge (3.3 is different)

files:



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

From python-checkins at python.org  Tue Nov 27 19:19:02 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Tue, 27 Nov 2012 19:19:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_null_merge?=
Message-ID: <3Y9tYL2DzxzRVx@mail.python.org>

http://hg.python.org/cpython/rev/e7f702e15152
changeset:   80608:e7f702e15152
parent:      80605:c28f593ea0cb
parent:      80607:218a4fefc7b2
user:        Gregory P. Smith <greg at krypto.org>
date:        Tue Nov 27 10:18:56 2012 -0800
summary:
  null merge

files:



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

From python-checkins at python.org  Tue Nov 27 19:21:18 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Tue, 27 Nov 2012 19:21:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Plug_a_leak_in?=
 =?utf-8?q?_timemodule=2E_The_module_dictionary_is_saved_during?=
Message-ID: <3Y9tby6CwlzRY2@mail.python.org>

http://hg.python.org/cpython/rev/57c157be847f
changeset:   80609:57c157be847f
branch:      2.7
parent:      80602:d805982336a0
user:        Gregory P. Smith <greg at krypto.org>
date:        Tue Nov 27 10:19:29 2012 -0800
summary:
  Plug a leak in timemodule. The module dictionary is saved during
initialization. If the interpreter is shut down and reinitialized (embedded
CPython), the old module dictionary was not dec-refed during the next import of
the time extension module.

Contributed by Torsten Marek of Google.

files:
  Misc/NEWS            |  3 +++
  Modules/timemodule.c |  9 ++++++---
  2 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -507,6 +507,9 @@
 Extension Modules
 -----------------
 
+- Fix the leak of a dict in the time module when used in an embedded
+  interpreter that is repeatedly initialized and shutdown and reinitialized.
+
 - Issue #12268: File readline, readlines and read or readall methods
   no longer lose data when an underlying read system call is interrupted
   within an io module object.  IOError is no longer raised due to a read
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -96,7 +96,7 @@
 static double floattime(void);
 
 /* For Y2K check */
-static PyObject *moddict;
+static PyObject *moddict = NULL;
 
 /* Exposed in timefuncs.h. */
 time_t
@@ -858,6 +858,11 @@
     /* Accept 2-digit dates unless PYTHONY2K is set and non-empty */
     p = Py_GETENV("PYTHONY2K");
     PyModule_AddIntConstant(m, "accept2dyear", (long) (!p || !*p));
+    /* If an embedded interpreter is shutdown and reinitialized the old
+       moddict was not decrefed on shutdown and the next import of this
+       module leads to a leak.  Conditionally decref here to prevent that.
+    */
+    Py_XDECREF(moddict);
     /* Squirrel away the module's dictionary for the y2k check */
     moddict = PyModule_GetDict(m);
     Py_INCREF(moddict);
@@ -1050,5 +1055,3 @@
 
     return 0;
 }
-
-

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

From python-checkins at python.org  Tue Nov 27 22:06:32 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Tue, 27 Nov 2012 22:06:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316464=3A_reset_Re?=
 =?utf-8?q?quest=27s_Content-Length_header_on_=2Edata_change=2E?=
Message-ID: <3Y9yGc4Tp9zRY9@mail.python.org>

http://hg.python.org/cpython/rev/618ea5612e83
changeset:   80610:618ea5612e83
parent:      80608:e7f702e15152
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Tue Nov 27 23:06:19 2012 +0200
summary:
  Issue #16464: reset Request's Content-Length header on .data change.
It will be recalculated on sending request to HTTP server.

Patch by Alexey Kachayev

files:
  Doc/library/urllib.request.rst |  10 +++++
  Lib/test/test_urllib2.py       |  37 ++++++++++++++++++++++
  Lib/urllib/request.py          |  27 ++++++++++++++-
  3 files changed, 72 insertions(+), 2 deletions(-)


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -408,6 +408,10 @@
 
    The entity body for the request, or None if not specified.
 
+   .. versionchanged:: 3.4
+      Changing value of :attr:`Request.data` now deletes "Content-Length"
+      header if it was previously set or calculated.
+
 .. attribute:: Request.unverifiable
 
    boolean, indicates whether the request is unverifiable as defined
@@ -456,6 +460,12 @@
    unredirected).
 
 
+.. method:: Request.remove_header(header)
+
+   Remove named header from the request instance (both from regular and
+   unredirected headers).
+
+
 .. method:: Request.get_full_url()
 
    Return the URL given in the constructor.
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -124,6 +124,19 @@
     >>> r.get_header("Not-there", "default")
     'default'
 
+    Method r.remove_header should remove items both from r.headers and
+    r.unredirected_hdrs dictionaries
+
+    >>> r.remove_header("Spam-eggs")
+    >>> r.has_header("Spam-eggs")
+    False
+    >>> r.add_unredirected_header("Unredirected-spam", "Eggs")
+    >>> r.has_header("Unredirected-spam")
+    True
+    >>> r.remove_header("Unredirected-spam")
+    >>> r.has_header("Unredirected-spam")
+    False
+
     """
 
 
@@ -1432,6 +1445,20 @@
         self.opener_has_handler(o, MyHTTPHandler)
         self.opener_has_handler(o, MyOtherHTTPHandler)
 
+    def test_issue16464(self):
+        opener = urllib.request.build_opener()
+        request = urllib.request.Request("http://www.python.org/~jeremy/")
+        self.assertEqual(None, request.data)
+
+        opener.open(request, "1".encode("us-ascii"))
+        self.assertEqual(b"1", request.data)
+        self.assertEqual("1", request.get_header("Content-length"))
+
+        opener.open(request, "1234567890".encode("us-ascii"))
+        self.assertEqual(b"1234567890", request.data)
+        self.assertEqual("10", request.get_header("Content-length"))
+
+
     def opener_has_handler(self, opener, handler_class):
         self.assertTrue(any(h.__class__ == handler_class
                             for h in opener.handlers))
@@ -1455,6 +1482,16 @@
         self.assertTrue(self.get.data)
         self.assertEqual("POST", self.get.get_method())
 
+    # issue 16464
+    # if we change data we need to remove content-length header
+    # (cause it's most probably calculated for previous value)
+    def test_setting_data_should_remove_content_length(self):
+        self.assertFalse("Content-length" in self.get.unredirected_hdrs)
+        self.get.add_unredirected_header("Content-length", 42)
+        self.assertEqual(42, self.get.unredirected_hdrs["Content-length"])
+        self.get.data = "spam"
+        self.assertFalse("Content-length" in self.get.unredirected_hdrs)
+
     def test_get_full_url(self):
         self.assertEqual("http://www.python.org/~jeremy/",
                          self.get.get_full_url())
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -266,12 +266,13 @@
         # unwrap('<URL:type://host/path>') --> 'type://host/path'
         self.full_url = unwrap(url)
         self.full_url, self.fragment = splittag(self.full_url)
+        self.headers = {}
+        self.unredirected_hdrs = {}
+        self._data = None
         self.data = data
-        self.headers = {}
         self._tunnel_host = None
         for key, value in headers.items():
             self.add_header(key, value)
-        self.unredirected_hdrs = {}
         if origin_req_host is None:
             origin_req_host = request_host(self)
         self.origin_req_host = origin_req_host
@@ -279,6 +280,24 @@
         self.method = method
         self._parse()
 
+    @property
+    def data(self):
+        return self._data
+
+    @data.setter
+    def data(self, data):
+        if data != self._data:
+            self._data = data
+            # issue 16464
+            # if we change data we need to remove content-length header
+            # (cause it's most probably calculated for previous value)
+            if self.has_header("Content-length"):
+                self.remove_header("Content-length")
+
+    @data.deleter
+    def data(self):
+        self._data = None
+
     def _parse(self):
         self.type, rest = splittype(self.full_url)
         if self.type is None:
@@ -374,6 +393,10 @@
             header_name,
             self.unredirected_hdrs.get(header_name, default))
 
+    def remove_header(self, header_name):
+        self.headers.pop(header_name, None)
+        self.unredirected_hdrs.pop(header_name, None)
+
     def header_items(self):
         hdrs = self.unredirected_hdrs.copy()
         hdrs.update(self.headers)

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

From solipsis at pitrou.net  Wed Nov 28 05:58:09 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 28 Nov 2012 05:58:09 +0100
Subject: [Python-checkins] Daily reference leaks (618ea5612e83): sum=0
Message-ID: <E1TdZir-0007Ca-1z@ap.vmr.nerim.net>

results for 618ea5612e83 on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Wed Nov 28 10:46:22 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 10:46:22 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_a_str_clas?=
 =?utf-8?q?s_entry_to_the_=22Text_Sequence_Type=22_section_=28issue_=23162?=
 =?utf-8?q?09=29=2E?=
Message-ID: <3YBH7L6m4XzRdC@mail.python.org>

http://hg.python.org/cpython/rev/0097379df2e1
changeset:   80611:0097379df2e1
branch:      3.3
parent:      80607:218a4fefc7b2
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 01:38:40 2012 -0800
summary:
  Add a str class entry to the "Text Sequence Type" section (issue #16209).

This commit also moves the documentation for the str built-in function to
the new class entry.  Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.

files:
  Doc/c-api/object.rst        |   4 +-
  Doc/extending/newtypes.rst  |   8 +-
  Doc/library/functions.rst   |  51 ++++------------------
  Doc/library/stdtypes.rst    |  56 +++++++++++++++++++++++-
  Doc/reference/datamodel.rst |  14 +++--
  Misc/NEWS                   |   3 +
  6 files changed, 79 insertions(+), 57 deletions(-)


diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -160,11 +160,11 @@
    a string similar to that returned by :c:func:`PyObject_Repr` in Python 2.
    Called by the :func:`ascii` built-in function.
 
+   .. index:: string; PyObject_Str (C function)
+
 
 .. c:function:: PyObject* PyObject_Str(PyObject *o)
 
-   .. index:: builtin: str
-
    Compute a string representation of object *o*.  Returns the string
    representation on success, *NULL* on failure.  This is the equivalent of the
    Python expression ``str(o)``.  Called by the :func:`str` built-in function
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -982,13 +982,13 @@
    }
 
 
+.. index::
+   single: string; object representation
+   builtin: repr
+
 Object Presentation
 -------------------
 
-.. index::
-   builtin: repr
-   builtin: str
-
 In Python, there are two ways to generate a textual representation of an object:
 the :func:`repr` function, and the :func:`str` function.  (The :func:`print`
 function just calls :func:`str`.)  These handlers are both optional.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -14,7 +14,7 @@
 :func:`all`          :func:`dir`        :func:`hex`         :func:`next`      :func:`slice`
 :func:`any`          :func:`divmod`     :func:`id`          :func:`object`    :func:`sorted`
 :func:`ascii`        :func:`enumerate`  :func:`input`       :func:`oct`       :func:`staticmethod`
-:func:`bin`          :func:`eval`       :func:`int`         :func:`open`      :func:`str`
+:func:`bin`          :func:`eval`       :func:`int`         :func:`open`      |func-str|_
 :func:`bool`         :func:`exec`       :func:`isinstance`  :func:`ord`       :func:`sum`
 :func:`bytearray`    :func:`filter`     :func:`issubclass`  :func:`pow`       :func:`super`
 :func:`bytes`        :func:`float`      :func:`iter`        :func:`print`     |func-tuple|_
@@ -34,6 +34,7 @@
 .. |func-memoryview| replace:: ``memoryview()``
 .. |func-set| replace:: ``set()``
 .. |func-list| replace:: ``list()``
+.. |func-str| replace:: ``str()``
 .. |func-tuple| replace:: ``tuple()``
 .. |func-range| replace:: ``range()``
 
@@ -521,13 +522,13 @@
 
    The float type is described in :ref:`typesnumeric`.
 
+   .. index::
+      single: __format__
+      single: string; format() (built-in function)
+
 
 .. function:: format(value[, format_spec])
 
-   .. index::
-      pair: str; format
-      single: __format__
-
    Convert a *value* to a "formatted" representation, as controlled by
    *format_spec*.  The interpretation of *format_spec* will depend on the type
    of the *value* argument, however there is a standard formatting syntax that
@@ -1238,44 +1239,12 @@
 .. _func-str:
 .. function:: str(object='')
               str(object=b'', encoding='utf-8', errors='strict')
+   :noindex:
 
-   Return a :ref:`string <textseq>` version of *object*.  If *object* is not
-   provided, returns the empty string.  Otherwise, the behavior of ``str()``
-   depends on whether *encoding* or *errors* is given, as follows.
+   Return a :class:`str` version of *object*.  See :func:`str` for details.
 
-   If neither *encoding* nor *errors* is given, ``str(object)`` returns
-   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
-   printable string representation of *object*.  For string objects, this is
-   the string itself.  If *object* does not have a :meth:`~object.__str__`
-   method, then :func:`str` falls back to returning
-   :meth:`repr(object) <repr>`.
-
-   .. index::
-      single: buffer protocol; str() (built-in function)
-      single: bytes; str() (built-in function)
-
-   If at least one of *encoding* or *errors* is given, *object* should be a
-   :class:`bytes` or :class:`bytearray` object, or more generally any object
-   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
-   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
-   ``str(bytes, encoding, errors)`` is equivalent to
-   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
-   object underlying the buffer object is obtained before calling
-   :meth:`bytes.decode`.  See :ref:`binaryseq` and
-   :ref:`bufferobjects` for information on buffer objects.
-
-   Passing a :class:`bytes` object to :func:`str` without the *encoding*
-   or *errors* arguments falls under the first case of returning the informal
-   string representation (see also the :option:`-b` command-line option to
-   Python).  For example::
-
-      >>> str(b'Zoot!')
-      "b'Zoot!'"
-
-   ``str`` is a built-in :term:`type`.  For more information on the string
-   type and its methods, see the :ref:`textseq` and :ref:`string-methods`
-   sections.  To output formatted strings, see the :ref:`string-formatting`
-   section.  In addition, see the :ref:`stringservices` section.
+   ``str`` is the built-in string :term:`class`.  For general information
+   about strings, see :ref:`textseq`.
 
 
 .. function:: sum(iterable[, start])
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1348,7 +1348,7 @@
 
 .. index::
    single: string; text sequence type
-   single: str() (built-in function); (see also string)
+   single: str (built-in class); (see also string)
    object: string
 
 .. _textseq:
@@ -1376,8 +1376,8 @@
 including supported escape sequences, and the ``r`` ("raw") prefix that
 disables most escape sequence processing.
 
-Strings may also be created from other objects with the built-in
-function :func:`str`.
+Strings may also be created from other objects using the :class:`str`
+constructor.
 
 Since there is no separate "character" type, indexing a string produces
 strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``.
@@ -1394,13 +1394,61 @@
    once again permitted on string literals. It has no effect on the meaning
    of string literals and cannot be combined with the ``r`` prefix.
 
+
+.. index::
+   single: string; str (built-in class)
+
+.. class:: str(object='')
+           str(object=b'', encoding='utf-8', errors='strict')
+
+   Return a :ref:`string <textseq>` version of *object*.  If *object* is not
+   provided, returns the empty string.  Otherwise, the behavior of ``str()``
+   depends on whether *encoding* or *errors* is given, as follows.
+
+   If neither *encoding* nor *errors* is given, ``str(object)`` returns
+   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
+   printable string representation of *object*.  For string objects, this is
+   the string itself.  If *object* does not have a :meth:`~object.__str__`
+   method, then :func:`str` falls back to returning
+   :meth:`repr(object) <repr>`.
+
+   .. index::
+      single: buffer protocol; str (built-in class)
+      single: bytes; str (built-in class)
+
+   If at least one of *encoding* or *errors* is given, *object* should be a
+   :class:`bytes` or :class:`bytearray` object, or more generally any object
+   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
+   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
+   ``str(bytes, encoding, errors)`` is equivalent to
+   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
+   object underlying the buffer object is obtained before calling
+   :meth:`bytes.decode`.  See :ref:`binaryseq` and
+   :ref:`bufferobjects` for information on buffer objects.
+
+   Passing a :class:`bytes` object to :func:`str` without the *encoding*
+   or *errors* arguments falls under the first case of returning the informal
+   string representation (see also the :option:`-b` command-line option to
+   Python).  For example::
+
+      >>> str(b'Zoot!')
+      "b'Zoot!'"
+
+   For more information on the ``str`` class and its methods, see
+   :ref:`textseq` and the :ref:`string-methods` section below.  To output
+   formatted strings, see the :ref:`string-formatting` section.  In addition,
+   see the :ref:`stringservices` section.
+
+
+.. index::
+   pair: string; methods
+
 .. _string-methods:
 
 String Methods
 --------------
 
 .. index::
-   pair: string; methods
    module: re
 
 Strings implement all of the :ref:`common <typesseq-common>` sequence
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -274,11 +274,13 @@
 
       The following types are immutable sequences:
 
+      .. index::
+         single: string; immutable sequences
+
       Strings
          .. index::
             builtin: chr
             builtin: ord
-            builtin: str
             single: character
             single: integer
             single: Unicode
@@ -1188,14 +1190,14 @@
    Called by :func:`bytes` to compute a byte-string representation of an
    object. This should return a ``bytes`` object.
 
+   .. index::
+      single: string; __format__() (object method)
+      pair: string; conversion
+      builtin: print
+
 
 .. method:: object.__format__(self, format_spec)
 
-   .. index::
-      pair: string; conversion
-      builtin: str
-      builtin: print
-
    Called by the :func:`format` built-in function (and by extension, the
    :meth:`str.format` method of class :class:`str`) to produce a "formatted"
    string representation of an object. The ``format_spec`` argument is
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -292,6 +292,9 @@
 Documentation
 -------------
 
+- Issue #16209: Move the documentation for the str built-in function to a new
+  str class entry in the "Text Sequence Type" section.
+
 - Issue #13538: Improve str() and object.__str__() documentation.
 
 - Issue #16489: Make it clearer that importlib.find_loader() requires any and

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

From python-checkins at python.org  Wed Nov 28 10:46:24 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 10:46:24 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_Add_a_str_class_entry_to_the_string_?=
 =?utf-8?q?section_=28issue_=2316209=29=2E?=
Message-ID: <3YBH7N3mmlzRdK@mail.python.org>

http://hg.python.org/cpython/rev/81ac75c64780
changeset:   80612:81ac75c64780
parent:      80610:618ea5612e83
parent:      80611:0097379df2e1
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 01:45:15 2012 -0800
summary:
  Merge from 3.3: Add a str class entry to the string section (issue #16209).

This commit also moves the documentation for the str built-in function to
the new class entry.  Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.

files:
  Doc/c-api/object.rst        |   4 +-
  Doc/extending/newtypes.rst  |   8 +-
  Doc/library/functions.rst   |  51 ++++------------------
  Doc/library/stdtypes.rst    |  56 +++++++++++++++++++++++-
  Doc/reference/datamodel.rst |  14 +++--
  Misc/NEWS                   |   3 +
  6 files changed, 79 insertions(+), 57 deletions(-)


diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -160,11 +160,11 @@
    a string similar to that returned by :c:func:`PyObject_Repr` in Python 2.
    Called by the :func:`ascii` built-in function.
 
+   .. index:: string; PyObject_Str (C function)
+
 
 .. c:function:: PyObject* PyObject_Str(PyObject *o)
 
-   .. index:: builtin: str
-
    Compute a string representation of object *o*.  Returns the string
    representation on success, *NULL* on failure.  This is the equivalent of the
    Python expression ``str(o)``.  Called by the :func:`str` built-in function
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -982,13 +982,13 @@
    }
 
 
+.. index::
+   single: string; object representation
+   builtin: repr
+
 Object Presentation
 -------------------
 
-.. index::
-   builtin: repr
-   builtin: str
-
 In Python, there are two ways to generate a textual representation of an object:
 the :func:`repr` function, and the :func:`str` function.  (The :func:`print`
 function just calls :func:`str`.)  These handlers are both optional.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -14,7 +14,7 @@
 :func:`all`          :func:`dir`        :func:`hex`         :func:`next`      :func:`slice`
 :func:`any`          :func:`divmod`     :func:`id`          :func:`object`    :func:`sorted`
 :func:`ascii`        :func:`enumerate`  :func:`input`       :func:`oct`       :func:`staticmethod`
-:func:`bin`          :func:`eval`       :func:`int`         :func:`open`      :func:`str`
+:func:`bin`          :func:`eval`       :func:`int`         :func:`open`      |func-str|_
 :func:`bool`         :func:`exec`       :func:`isinstance`  :func:`ord`       :func:`sum`
 :func:`bytearray`    :func:`filter`     :func:`issubclass`  :func:`pow`       :func:`super`
 :func:`bytes`        :func:`float`      :func:`iter`        :func:`print`     |func-tuple|_
@@ -34,6 +34,7 @@
 .. |func-memoryview| replace:: ``memoryview()``
 .. |func-set| replace:: ``set()``
 .. |func-list| replace:: ``list()``
+.. |func-str| replace:: ``str()``
 .. |func-tuple| replace:: ``tuple()``
 .. |func-range| replace:: ``range()``
 
@@ -521,13 +522,13 @@
 
    The float type is described in :ref:`typesnumeric`.
 
+   .. index::
+      single: __format__
+      single: string; format() (built-in function)
+
 
 .. function:: format(value[, format_spec])
 
-   .. index::
-      pair: str; format
-      single: __format__
-
    Convert a *value* to a "formatted" representation, as controlled by
    *format_spec*.  The interpretation of *format_spec* will depend on the type
    of the *value* argument, however there is a standard formatting syntax that
@@ -1238,44 +1239,12 @@
 .. _func-str:
 .. function:: str(object='')
               str(object=b'', encoding='utf-8', errors='strict')
+   :noindex:
 
-   Return a :ref:`string <textseq>` version of *object*.  If *object* is not
-   provided, returns the empty string.  Otherwise, the behavior of ``str()``
-   depends on whether *encoding* or *errors* is given, as follows.
+   Return a :class:`str` version of *object*.  See :func:`str` for details.
 
-   If neither *encoding* nor *errors* is given, ``str(object)`` returns
-   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
-   printable string representation of *object*.  For string objects, this is
-   the string itself.  If *object* does not have a :meth:`~object.__str__`
-   method, then :func:`str` falls back to returning
-   :meth:`repr(object) <repr>`.
-
-   .. index::
-      single: buffer protocol; str() (built-in function)
-      single: bytes; str() (built-in function)
-
-   If at least one of *encoding* or *errors* is given, *object* should be a
-   :class:`bytes` or :class:`bytearray` object, or more generally any object
-   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
-   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
-   ``str(bytes, encoding, errors)`` is equivalent to
-   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
-   object underlying the buffer object is obtained before calling
-   :meth:`bytes.decode`.  See :ref:`binaryseq` and
-   :ref:`bufferobjects` for information on buffer objects.
-
-   Passing a :class:`bytes` object to :func:`str` without the *encoding*
-   or *errors* arguments falls under the first case of returning the informal
-   string representation (see also the :option:`-b` command-line option to
-   Python).  For example::
-
-      >>> str(b'Zoot!')
-      "b'Zoot!'"
-
-   ``str`` is a built-in :term:`type`.  For more information on the string
-   type and its methods, see the :ref:`textseq` and :ref:`string-methods`
-   sections.  To output formatted strings, see the :ref:`string-formatting`
-   section.  In addition, see the :ref:`stringservices` section.
+   ``str`` is the built-in string :term:`class`.  For general information
+   about strings, see :ref:`textseq`.
 
 
 .. function:: sum(iterable[, start])
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1348,7 +1348,7 @@
 
 .. index::
    single: string; text sequence type
-   single: str() (built-in function); (see also string)
+   single: str (built-in class); (see also string)
    object: string
 
 .. _textseq:
@@ -1376,8 +1376,8 @@
 including supported escape sequences, and the ``r`` ("raw") prefix that
 disables most escape sequence processing.
 
-Strings may also be created from other objects with the built-in
-function :func:`str`.
+Strings may also be created from other objects using the :class:`str`
+constructor.
 
 Since there is no separate "character" type, indexing a string produces
 strings of length 1. That is, for a non-empty string *s*, ``s[0] == s[0:1]``.
@@ -1394,13 +1394,61 @@
    once again permitted on string literals. It has no effect on the meaning
    of string literals and cannot be combined with the ``r`` prefix.
 
+
+.. index::
+   single: string; str (built-in class)
+
+.. class:: str(object='')
+           str(object=b'', encoding='utf-8', errors='strict')
+
+   Return a :ref:`string <textseq>` version of *object*.  If *object* is not
+   provided, returns the empty string.  Otherwise, the behavior of ``str()``
+   depends on whether *encoding* or *errors* is given, as follows.
+
+   If neither *encoding* nor *errors* is given, ``str(object)`` returns
+   :meth:`object.__str__() <object.__str__>`, which is the "informal" or nicely
+   printable string representation of *object*.  For string objects, this is
+   the string itself.  If *object* does not have a :meth:`~object.__str__`
+   method, then :func:`str` falls back to returning
+   :meth:`repr(object) <repr>`.
+
+   .. index::
+      single: buffer protocol; str (built-in class)
+      single: bytes; str (built-in class)
+
+   If at least one of *encoding* or *errors* is given, *object* should be a
+   :class:`bytes` or :class:`bytearray` object, or more generally any object
+   that supports the :ref:`buffer protocol <bufferobjects>`.  In this case, if
+   *object* is a :class:`bytes` (or :class:`bytearray`) object, then
+   ``str(bytes, encoding, errors)`` is equivalent to
+   :meth:`bytes.decode(encoding, errors) <bytes.decode>`.  Otherwise, the bytes
+   object underlying the buffer object is obtained before calling
+   :meth:`bytes.decode`.  See :ref:`binaryseq` and
+   :ref:`bufferobjects` for information on buffer objects.
+
+   Passing a :class:`bytes` object to :func:`str` without the *encoding*
+   or *errors* arguments falls under the first case of returning the informal
+   string representation (see also the :option:`-b` command-line option to
+   Python).  For example::
+
+      >>> str(b'Zoot!')
+      "b'Zoot!'"
+
+   For more information on the ``str`` class and its methods, see
+   :ref:`textseq` and the :ref:`string-methods` section below.  To output
+   formatted strings, see the :ref:`string-formatting` section.  In addition,
+   see the :ref:`stringservices` section.
+
+
+.. index::
+   pair: string; methods
+
 .. _string-methods:
 
 String Methods
 --------------
 
 .. index::
-   pair: string; methods
    module: re
 
 Strings implement all of the :ref:`common <typesseq-common>` sequence
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -274,11 +274,13 @@
 
       The following types are immutable sequences:
 
+      .. index::
+         single: string; immutable sequences
+
       Strings
          .. index::
             builtin: chr
             builtin: ord
-            builtin: str
             single: character
             single: integer
             single: Unicode
@@ -1188,14 +1190,14 @@
    Called by :func:`bytes` to compute a byte-string representation of an
    object. This should return a ``bytes`` object.
 
+   .. index::
+      single: string; __format__() (object method)
+      pair: string; conversion
+      builtin: print
+
 
 .. method:: object.__format__(self, format_spec)
 
-   .. index::
-      pair: string; conversion
-      builtin: str
-      builtin: print
-
    Called by the :func:`format` built-in function (and by extension, the
    :meth:`str.format` method of class :class:`str`) to produce a "formatted"
    string representation of an object. The ``format_spec`` argument is
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -418,6 +418,9 @@
 Documentation
 -------------
 
+- Issue #16209: Move the documentation for the str built-in function to a new
+  str class entry in the "Text Sequence Type" section.
+
 - Issue #13538: Improve str() and object.__str__() documentation.
 
 - Issue #16489: Make it clearer that importlib.find_loader() needs parent

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

From python-checkins at python.org  Wed Nov 28 11:34:39 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 11:34:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MzIz?=
 =?utf-8?q?=3A_Fix_wrong_C_API_documentation_for_locale_encoding=2E?=
Message-ID: <3YBJC36zfczRGj@mail.python.org>

http://hg.python.org/cpython/rev/11629c14ce1f
changeset:   80613:11629c14ce1f
branch:      3.3
parent:      80611:0097379df2e1
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 12:33:58 2012 +0200
summary:
  Issue #16323: Fix wrong C API documentation for locale encoding.

Patch by Berker Peksag.

files:
  Doc/c-api/unicode.rst |  46 ++++++++++++++++--------------
  1 files changed, 25 insertions(+), 21 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -735,15 +735,18 @@
 The current locale encoding can be used to decode text from the operating
 system.
 
-.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, Py_ssize_t len, int surrogateescape)
-
-   Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`) to escape undecodable
-   bytes. If a byte sequence can be decoded as a surrogate character and
-   *surrogateescape* is not equal to zero, the byte sequence is escaped using
-   the ``'surrogateescape'`` error handler instead of being decoded.  *str*
-   must end with a null character but cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, \
+                                                        Py_ssize_t len, \
+                                                        const char *errors)
+
+   Decode a string from the current locale encoding. The supported
+   error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The decoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. If a byte sequence can be decoded as a
+   surrogate character and *errors* is not ``"strict"``, then the byte
+   sequence is escaped using the ``"surrogateescape"`` error handler
+   instead of being decoded. *str* must end with a null character but
+   cannot contain embedded null characters.
 
    .. seealso::
 
@@ -754,7 +757,7 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, int surrogateescape)
+.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, const char *errors)
 
    Similar to :c:func:`PyUnicode_DecodeLocaleAndSize`, but compute the string
    length using :c:func:`strlen`.
@@ -762,12 +765,13 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, int surrogateescape)
-
-   Encode a Unicode object to the current locale encoding. The encoder is
-   strict if *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`). Return a :class:`bytes`
-   object. *str* cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
+
+   Encode a Unicode object to the current locale encoding. The
+   supported error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The encoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. Return a :class:`bytes` object. *str* cannot
+   contain embedded null characters.
 
    .. seealso::
 
@@ -813,7 +817,7 @@
 .. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
 
    Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -826,13 +830,13 @@
       :c:func:`PyUnicode_DecodeLocaleAndSize`.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s)
 
    Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding`
-   and the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   and the ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -840,13 +844,13 @@
    Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode)
 
    Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows, and return
    :class:`bytes`. Note that the resulting :class:`bytes` object may contain
    null bytes.
 

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

From python-checkins at python.org  Wed Nov 28 11:34:41 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 11:34:41 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316323=3A_Fix_wrong_C_API_documentation_fo?=
 =?utf-8?q?r_locale_encoding=2E?=
Message-ID: <3YBJC53dK2zRXW@mail.python.org>

http://hg.python.org/cpython/rev/6f3d3003acf3
changeset:   80614:6f3d3003acf3
parent:      80612:81ac75c64780
parent:      80613:11629c14ce1f
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 12:34:27 2012 +0200
summary:
  Merge issue #16323: Fix wrong C API documentation for locale encoding.

Patch by Berker Peksag.

files:
  Doc/c-api/unicode.rst |  46 ++++++++++++++++--------------
  1 files changed, 25 insertions(+), 21 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -735,15 +735,18 @@
 The current locale encoding can be used to decode text from the operating
 system.
 
-.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, Py_ssize_t len, int surrogateescape)
-
-   Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`) to escape undecodable
-   bytes. If a byte sequence can be decoded as a surrogate character and
-   *surrogateescape* is not equal to zero, the byte sequence is escaped using
-   the ``'surrogateescape'`` error handler instead of being decoded.  *str*
-   must end with a null character but cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, \
+                                                        Py_ssize_t len, \
+                                                        const char *errors)
+
+   Decode a string from the current locale encoding. The supported
+   error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The decoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. If a byte sequence can be decoded as a
+   surrogate character and *errors* is not ``"strict"``, then the byte
+   sequence is escaped using the ``"surrogateescape"`` error handler
+   instead of being decoded. *str* must end with a null character but
+   cannot contain embedded null characters.
 
    .. seealso::
 
@@ -754,7 +757,7 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, int surrogateescape)
+.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, const char *errors)
 
    Similar to :c:func:`PyUnicode_DecodeLocaleAndSize`, but compute the string
    length using :c:func:`strlen`.
@@ -762,12 +765,13 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, int surrogateescape)
-
-   Encode a Unicode object to the current locale encoding. The encoder is
-   strict if *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`). Return a :class:`bytes`
-   object. *str* cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
+
+   Encode a Unicode object to the current locale encoding. The
+   supported error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The encoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. Return a :class:`bytes` object. *str* cannot
+   contain embedded null characters.
 
    .. seealso::
 
@@ -813,7 +817,7 @@
 .. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
 
    Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -826,13 +830,13 @@
       :c:func:`PyUnicode_DecodeLocaleAndSize`.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s)
 
    Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding`
-   and the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   and the ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -840,13 +844,13 @@
    Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode)
 
    Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows, and return
    :class:`bytes`. Note that the resulting :class:`bytes` object may contain
    null bytes.
 

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

From python-checkins at python.org  Wed Nov 28 11:52:57 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 11:52:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Improve_argume?=
 =?utf-8?q?nt/parameter_documentation_=28issue_=2315990=29=2E?=
Message-ID: <3YBJc95l0QzRSR@mail.python.org>

http://hg.python.org/cpython/rev/69d5d834c5cb
changeset:   80615:69d5d834c5cb
branch:      3.2
parent:      80606:478492476b1f
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 02:29:33 2012 -0800
summary:
  Improve argument/parameter documentation (issue #15990).

This commit adds "parameter" to the glossary, improves and consolidates the
"argument" glossary entry, and adds a question to the FAQ on the difference
between arguments and parameters.

files:
  Doc/faq/programming.rst |  21 ++++++
  Doc/glossary.rst        |  94 +++++++++++++++++++++++-----
  Misc/NEWS               |   2 +
  3 files changed, 99 insertions(+), 18 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -313,6 +313,27 @@
        g(x, *args, **kwargs)
 
 
+.. _faq-argument-vs-parameter:
+
+What is the difference between arguments and parameters?
+--------------------------------------------------------
+
+:term:`Parameters <parameter>` are defined by the names that appear in a
+function definition, whereas :term:`arguments <argument>` are the values
+actually passed to a function when calling it.  Parameters define what types of
+arguments a function can accept.  For example, given the function definition::
+
+   def func(foo, bar=None, **kwargs):
+       pass
+
+*foo*, *bar* and *kwargs* are parameters of ``func``.  However, when calling
+``func``, for example::
+
+   func(42, bar=314, extra=somevar)
+
+the values ``42``, ``314``, and ``somevar`` are arguments.
+
+
 How do I write a function with output parameters (call by reference)?
 ---------------------------------------------------------------------
 
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -40,16 +40,34 @@
       ABCs with the :mod:`abc` module.
 
    argument
-      A value passed to a function or method, assigned to a named local
-      variable in the function body.  A function or method may have both
-      positional arguments and keyword arguments in its definition.
-      Positional and keyword arguments may be variable-length: ``*`` accepts
-      or passes (if in the function definition or call) several positional
-      arguments in a list, while ``**`` does the same for keyword arguments
-      in a dictionary.
+      A value passed to a :term:`function` (or :term:`method`) when calling the
+      function.  There are two types of arguments:
 
-      Any expression may be used within the argument list, and the evaluated
-      value is passed to the local variable.
+      * :dfn:`keyword argument`: an argument preceded by an identifier (e.g.
+        ``name=``) in a function call or passed as a value in a dictionary
+        preceded by ``**``.  For example, ``3`` and ``5`` are both keyword
+        arguments in the following calls to :func:`complex`::
+
+           complex(real=3, imag=5)
+           complex(**{'real': 3, 'imag': 5})
+
+      * :dfn:`positional argument`: an argument that is not a keyword argument.
+        Positional arguments can appear at the beginning of an argument list
+        and/or be passed as elements of an :term:`iterable` preceded by ``*``.
+        For example, ``3`` and ``5`` are both positional arguments in the
+        following calls::
+
+           complex(3, 5)
+           complex(*(3, 5))
+
+      Arguments are assigned to the named local variables in a function body.
+      See the :ref:`calls` section for the rules governing this assignment.
+      Syntactically, any expression can be used to represent an argument; the
+      evaluated value is assigned to the local variable.
+
+      See also the :term:`parameter` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, and :pep:`362`.
 
    attribute
       A value associated with an object which is referenced by name using
@@ -391,10 +409,7 @@
       <sortinghowto>` for examples of how to create and use key functions.
 
    keyword argument
-      Arguments which are preceded with a ``variable_name=`` in the call.
-      The variable name designates the local name in the function to which the
-      value is assigned.  ``**`` is used to accept or pass a dictionary of
-      keyword arguments.  See :term:`argument`.
+      See :term:`argument`.
 
    lambda
       An anonymous inline function consisting of a single :term:`expression`
@@ -516,12 +531,55 @@
       (methods).  Also the ultimate base class of any :term:`new-style
       class`.
 
+   parameter
+      A named entity in a :term:`function` (or method) definition that
+      specifies an :term:`argument` (or in some cases, arguments) that the
+      function can accept.  There are five types of parameters:
+
+      * :dfn:`positional-or-keyword`: specifies an argument that can be passed
+        either :term:`positionally <argument>` or as a :term:`keyword argument
+        <argument>`.  This is the default kind of parameter, for example *foo*
+        and *bar* in the following::
+
+           def func(foo, bar=None): ...
+
+      * :dfn:`positional-only`: specifies an argument that can be supplied only
+        by position.  Python has no syntax for defining positional-only
+        parameters.  However, some built-in functions have positional-only
+        parameters (e.g. :func:`abs`).
+
+      * :dfn:`keyword-only`: specifies an argument that can be supplied only
+        by keyword.  Keyword-only parameters can be defined by including a
+        single var-positional parameter or bare ``*`` in the parameter list
+        of the function definition before them, for example *kw_only1* and
+        *kw_only2* in the following::
+
+           def func(arg, *, kw_only1, kw_only2): ...
+
+      * :dfn:`var-positional`: specifies that an arbitrary sequence of
+        positional arguments can be provided (in addition to any positional
+        arguments already accepted by other parameters).  Such a parameter can
+        be defined by prepending the parameter name with ``*``, for example
+        *args* in the following::
+
+           def func(*args, **kwargs): ...
+
+      * :dfn:`var-keyword`: specifies that arbitrarily many keyword arguments
+        can be provided (in addition to any keyword arguments already accepted
+        by other parameters).  Such a parameter can be defined by prepending
+        the parameter name with ``**``, for example *kwargs* in the example
+        above.
+
+      Parameters can specify both optional and required arguments, as well as
+      default values for some optional arguments.
+
+      See also the :term:`argument` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, the :class:`inspect.Parameter` class, the
+      :ref:`function` section, and :pep:`362`.
+
    positional argument
-      The arguments assigned to local names inside a function or method,
-      determined by the order in which they were given in the call.  ``*`` is
-      used to either accept multiple positional arguments (when in the
-      definition), or pass several arguments as a list to a function.  See
-      :term:`argument`.
+      See :term:`argument`.
 
    Python 3000
       Nickname for the Python 3.x release line (coined long ago when the release
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -741,6 +741,8 @@
 Documentation
 -------------
 
+- Issue #15990: Improve argument/parameter documentation.
+
 - Issue #13538: Improve str() and object.__str__() documentation.
 
 - Issue #16400: Update the description of which versions of a given package

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

From python-checkins at python.org  Wed Nov 28 11:52:59 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 11:52:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_from_3=2E2=3A_improve_argument/parameter_documentation_?=
 =?utf-8?b?KGlzc3VlICMxNTk5MCku?=
Message-ID: <3YBJcC28z3zRXN@mail.python.org>

http://hg.python.org/cpython/rev/40fd26a4206b
changeset:   80616:40fd26a4206b
branch:      3.3
parent:      80611:0097379df2e1
parent:      80615:69d5d834c5cb
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 02:37:42 2012 -0800
summary:
  Merge from 3.2: improve argument/parameter documentation (issue #15990).

files:
  Doc/faq/programming.rst |  21 ++++++
  Doc/glossary.rst        |  94 +++++++++++++++++++++++-----
  Misc/NEWS               |   2 +
  3 files changed, 99 insertions(+), 18 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -313,6 +313,27 @@
        g(x, *args, **kwargs)
 
 
+.. _faq-argument-vs-parameter:
+
+What is the difference between arguments and parameters?
+--------------------------------------------------------
+
+:term:`Parameters <parameter>` are defined by the names that appear in a
+function definition, whereas :term:`arguments <argument>` are the values
+actually passed to a function when calling it.  Parameters define what types of
+arguments a function can accept.  For example, given the function definition::
+
+   def func(foo, bar=None, **kwargs):
+       pass
+
+*foo*, *bar* and *kwargs* are parameters of ``func``.  However, when calling
+``func``, for example::
+
+   func(42, bar=314, extra=somevar)
+
+the values ``42``, ``314``, and ``somevar`` are arguments.
+
+
 How do I write a function with output parameters (call by reference)?
 ---------------------------------------------------------------------
 
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -40,16 +40,34 @@
       ABCs with the :mod:`abc` module.
 
    argument
-      A value passed to a function or method, assigned to a named local
-      variable in the function body.  A function or method may have both
-      positional arguments and keyword arguments in its definition.
-      Positional and keyword arguments may be variable-length: ``*`` accepts
-      or passes (if in the function definition or call) several positional
-      arguments in a list, while ``**`` does the same for keyword arguments
-      in a dictionary.
+      A value passed to a :term:`function` (or :term:`method`) when calling the
+      function.  There are two types of arguments:
 
-      Any expression may be used within the argument list, and the evaluated
-      value is passed to the local variable.
+      * :dfn:`keyword argument`: an argument preceded by an identifier (e.g.
+        ``name=``) in a function call or passed as a value in a dictionary
+        preceded by ``**``.  For example, ``3`` and ``5`` are both keyword
+        arguments in the following calls to :func:`complex`::
+
+           complex(real=3, imag=5)
+           complex(**{'real': 3, 'imag': 5})
+
+      * :dfn:`positional argument`: an argument that is not a keyword argument.
+        Positional arguments can appear at the beginning of an argument list
+        and/or be passed as elements of an :term:`iterable` preceded by ``*``.
+        For example, ``3`` and ``5`` are both positional arguments in the
+        following calls::
+
+           complex(3, 5)
+           complex(*(3, 5))
+
+      Arguments are assigned to the named local variables in a function body.
+      See the :ref:`calls` section for the rules governing this assignment.
+      Syntactically, any expression can be used to represent an argument; the
+      evaluated value is assigned to the local variable.
+
+      See also the :term:`parameter` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, and :pep:`362`.
 
    attribute
       A value associated with an object which is referenced by name using
@@ -402,10 +420,7 @@
       <sortinghowto>` for examples of how to create and use key functions.
 
    keyword argument
-      Arguments which are preceded with a ``variable_name=`` in the call.
-      The variable name designates the local name in the function to which the
-      value is assigned.  ``**`` is used to accept or pass a dictionary of
-      keyword arguments.  See :term:`argument`.
+      See :term:`argument`.
 
    lambda
       An anonymous inline function consisting of a single :term:`expression`
@@ -548,6 +563,53 @@
       subpackages.  Technically, a package is a Python module with an
       ``__path__`` attribute.
 
+   parameter
+      A named entity in a :term:`function` (or method) definition that
+      specifies an :term:`argument` (or in some cases, arguments) that the
+      function can accept.  There are five types of parameters:
+
+      * :dfn:`positional-or-keyword`: specifies an argument that can be passed
+        either :term:`positionally <argument>` or as a :term:`keyword argument
+        <argument>`.  This is the default kind of parameter, for example *foo*
+        and *bar* in the following::
+
+           def func(foo, bar=None): ...
+
+      * :dfn:`positional-only`: specifies an argument that can be supplied only
+        by position.  Python has no syntax for defining positional-only
+        parameters.  However, some built-in functions have positional-only
+        parameters (e.g. :func:`abs`).
+
+      * :dfn:`keyword-only`: specifies an argument that can be supplied only
+        by keyword.  Keyword-only parameters can be defined by including a
+        single var-positional parameter or bare ``*`` in the parameter list
+        of the function definition before them, for example *kw_only1* and
+        *kw_only2* in the following::
+
+           def func(arg, *, kw_only1, kw_only2): ...
+
+      * :dfn:`var-positional`: specifies that an arbitrary sequence of
+        positional arguments can be provided (in addition to any positional
+        arguments already accepted by other parameters).  Such a parameter can
+        be defined by prepending the parameter name with ``*``, for example
+        *args* in the following::
+
+           def func(*args, **kwargs): ...
+
+      * :dfn:`var-keyword`: specifies that arbitrarily many keyword arguments
+        can be provided (in addition to any keyword arguments already accepted
+        by other parameters).  Such a parameter can be defined by prepending
+        the parameter name with ``**``, for example *kwargs* in the example
+        above.
+
+      Parameters can specify both optional and required arguments, as well as
+      default values for some optional arguments.
+
+      See also the :term:`argument` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, the :class:`inspect.Parameter` class, the
+      :ref:`function` section, and :pep:`362`.
+
    path entry
       A single location on the :term:`import path` which the :term:`path
       based finder` consults to find modules for importing.
@@ -571,11 +633,7 @@
       that contribute to a namespace package, as defined in :pep:`420`.
 
    positional argument
-      The arguments assigned to local names inside a function or method,
-      determined by the order in which they were given in the call.  ``*`` is
-      used to either accept multiple positional arguments (when in the
-      definition), or pass several arguments as a list to a function.  See
-      :term:`argument`.
+      See :term:`argument`.
 
    provisional package
       A provisional package is one which has been deliberately excluded from
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -292,6 +292,8 @@
 Documentation
 -------------
 
+- Issue #15990: Improve argument/parameter documentation.
+
 - Issue #16209: Move the documentation for the str built-in function to a new
   str class entry in the "Text Sequence Type" section.
 

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

From python-checkins at python.org  Wed Nov 28 11:53:00 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 11:53:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_from_3=2E3=3A_improve_argument/parameter_documenta?=
 =?utf-8?q?tion_=28issue_=2315990=29=2E?=
Message-ID: <3YBJcD5mbwzRXq@mail.python.org>

http://hg.python.org/cpython/rev/74d8a2a20c52
changeset:   80617:74d8a2a20c52
parent:      80612:81ac75c64780
parent:      80616:40fd26a4206b
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 02:42:26 2012 -0800
summary:
  Merge from 3.3: improve argument/parameter documentation (issue #15990).

files:
  Doc/faq/programming.rst |  21 ++++++
  Doc/glossary.rst        |  94 +++++++++++++++++++++++-----
  Misc/NEWS               |   2 +
  3 files changed, 99 insertions(+), 18 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -313,6 +313,27 @@
        g(x, *args, **kwargs)
 
 
+.. _faq-argument-vs-parameter:
+
+What is the difference between arguments and parameters?
+--------------------------------------------------------
+
+:term:`Parameters <parameter>` are defined by the names that appear in a
+function definition, whereas :term:`arguments <argument>` are the values
+actually passed to a function when calling it.  Parameters define what types of
+arguments a function can accept.  For example, given the function definition::
+
+   def func(foo, bar=None, **kwargs):
+       pass
+
+*foo*, *bar* and *kwargs* are parameters of ``func``.  However, when calling
+``func``, for example::
+
+   func(42, bar=314, extra=somevar)
+
+the values ``42``, ``314``, and ``somevar`` are arguments.
+
+
 How do I write a function with output parameters (call by reference)?
 ---------------------------------------------------------------------
 
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -40,16 +40,34 @@
       ABCs with the :mod:`abc` module.
 
    argument
-      A value passed to a function or method, assigned to a named local
-      variable in the function body.  A function or method may have both
-      positional arguments and keyword arguments in its definition.
-      Positional and keyword arguments may be variable-length: ``*`` accepts
-      or passes (if in the function definition or call) several positional
-      arguments in a list, while ``**`` does the same for keyword arguments
-      in a dictionary.
+      A value passed to a :term:`function` (or :term:`method`) when calling the
+      function.  There are two types of arguments:
 
-      Any expression may be used within the argument list, and the evaluated
-      value is passed to the local variable.
+      * :dfn:`keyword argument`: an argument preceded by an identifier (e.g.
+        ``name=``) in a function call or passed as a value in a dictionary
+        preceded by ``**``.  For example, ``3`` and ``5`` are both keyword
+        arguments in the following calls to :func:`complex`::
+
+           complex(real=3, imag=5)
+           complex(**{'real': 3, 'imag': 5})
+
+      * :dfn:`positional argument`: an argument that is not a keyword argument.
+        Positional arguments can appear at the beginning of an argument list
+        and/or be passed as elements of an :term:`iterable` preceded by ``*``.
+        For example, ``3`` and ``5`` are both positional arguments in the
+        following calls::
+
+           complex(3, 5)
+           complex(*(3, 5))
+
+      Arguments are assigned to the named local variables in a function body.
+      See the :ref:`calls` section for the rules governing this assignment.
+      Syntactically, any expression can be used to represent an argument; the
+      evaluated value is assigned to the local variable.
+
+      See also the :term:`parameter` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, and :pep:`362`.
 
    attribute
       A value associated with an object which is referenced by name using
@@ -402,10 +420,7 @@
       <sortinghowto>` for examples of how to create and use key functions.
 
    keyword argument
-      Arguments which are preceded with a ``variable_name=`` in the call.
-      The variable name designates the local name in the function to which the
-      value is assigned.  ``**`` is used to accept or pass a dictionary of
-      keyword arguments.  See :term:`argument`.
+      See :term:`argument`.
 
    lambda
       An anonymous inline function consisting of a single :term:`expression`
@@ -548,6 +563,53 @@
       subpackages.  Technically, a package is a Python module with an
       ``__path__`` attribute.
 
+   parameter
+      A named entity in a :term:`function` (or method) definition that
+      specifies an :term:`argument` (or in some cases, arguments) that the
+      function can accept.  There are five types of parameters:
+
+      * :dfn:`positional-or-keyword`: specifies an argument that can be passed
+        either :term:`positionally <argument>` or as a :term:`keyword argument
+        <argument>`.  This is the default kind of parameter, for example *foo*
+        and *bar* in the following::
+
+           def func(foo, bar=None): ...
+
+      * :dfn:`positional-only`: specifies an argument that can be supplied only
+        by position.  Python has no syntax for defining positional-only
+        parameters.  However, some built-in functions have positional-only
+        parameters (e.g. :func:`abs`).
+
+      * :dfn:`keyword-only`: specifies an argument that can be supplied only
+        by keyword.  Keyword-only parameters can be defined by including a
+        single var-positional parameter or bare ``*`` in the parameter list
+        of the function definition before them, for example *kw_only1* and
+        *kw_only2* in the following::
+
+           def func(arg, *, kw_only1, kw_only2): ...
+
+      * :dfn:`var-positional`: specifies that an arbitrary sequence of
+        positional arguments can be provided (in addition to any positional
+        arguments already accepted by other parameters).  Such a parameter can
+        be defined by prepending the parameter name with ``*``, for example
+        *args* in the following::
+
+           def func(*args, **kwargs): ...
+
+      * :dfn:`var-keyword`: specifies that arbitrarily many keyword arguments
+        can be provided (in addition to any keyword arguments already accepted
+        by other parameters).  Such a parameter can be defined by prepending
+        the parameter name with ``**``, for example *kwargs* in the example
+        above.
+
+      Parameters can specify both optional and required arguments, as well as
+      default values for some optional arguments.
+
+      See also the :term:`argument` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, the :class:`inspect.Parameter` class, the
+      :ref:`function` section, and :pep:`362`.
+
    path entry
       A single location on the :term:`import path` which the :term:`path
       based finder` consults to find modules for importing.
@@ -571,11 +633,7 @@
       that contribute to a namespace package, as defined in :pep:`420`.
 
    positional argument
-      The arguments assigned to local names inside a function or method,
-      determined by the order in which they were given in the call.  ``*`` is
-      used to either accept multiple positional arguments (when in the
-      definition), or pass several arguments as a list to a function.  See
-      :term:`argument`.
+      See :term:`argument`.
 
    provisional package
       A provisional package is one which has been deliberately excluded from
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -418,6 +418,8 @@
 Documentation
 -------------
 
+- Issue #15990: Improve argument/parameter documentation.
+
 - Issue #16209: Move the documentation for the str built-in function to a new
   str class entry in the "Text Sequence Type" section.
 

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

From python-checkins at python.org  Wed Nov 28 11:53:02 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 11:53:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_Merge_heads=2E?=
Message-ID: <3YBJcG2B9GzRXq@mail.python.org>

http://hg.python.org/cpython/rev/f18793b103de
changeset:   80618:f18793b103de
branch:      3.3
parent:      80616:40fd26a4206b
parent:      80613:11629c14ce1f
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 02:45:34 2012 -0800
summary:
  Merge heads.

files:
  Doc/c-api/unicode.rst |  46 ++++++++++++++++--------------
  1 files changed, 25 insertions(+), 21 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -735,15 +735,18 @@
 The current locale encoding can be used to decode text from the operating
 system.
 
-.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, Py_ssize_t len, int surrogateescape)
-
-   Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`) to escape undecodable
-   bytes. If a byte sequence can be decoded as a surrogate character and
-   *surrogateescape* is not equal to zero, the byte sequence is escaped using
-   the ``'surrogateescape'`` error handler instead of being decoded.  *str*
-   must end with a null character but cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, \
+                                                        Py_ssize_t len, \
+                                                        const char *errors)
+
+   Decode a string from the current locale encoding. The supported
+   error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The decoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. If a byte sequence can be decoded as a
+   surrogate character and *errors* is not ``"strict"``, then the byte
+   sequence is escaped using the ``"surrogateescape"`` error handler
+   instead of being decoded. *str* must end with a null character but
+   cannot contain embedded null characters.
 
    .. seealso::
 
@@ -754,7 +757,7 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, int surrogateescape)
+.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, const char *errors)
 
    Similar to :c:func:`PyUnicode_DecodeLocaleAndSize`, but compute the string
    length using :c:func:`strlen`.
@@ -762,12 +765,13 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, int surrogateescape)
-
-   Encode a Unicode object to the current locale encoding. The encoder is
-   strict if *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`). Return a :class:`bytes`
-   object. *str* cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
+
+   Encode a Unicode object to the current locale encoding. The
+   supported error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The encoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. Return a :class:`bytes` object. *str* cannot
+   contain embedded null characters.
 
    .. seealso::
 
@@ -813,7 +817,7 @@
 .. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
 
    Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -826,13 +830,13 @@
       :c:func:`PyUnicode_DecodeLocaleAndSize`.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s)
 
    Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding`
-   and the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   and the ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -840,13 +844,13 @@
    Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode)
 
    Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows, and return
    :class:`bytes`. Note that the resulting :class:`bytes` object may contain
    null bytes.
 

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

From python-checkins at python.org  Wed Nov 28 11:53:03 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 11:53:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgaGVhZHMu?=
Message-ID: <3YBJcH5XJXzRWB@mail.python.org>

http://hg.python.org/cpython/rev/a8a89ab866f5
changeset:   80619:a8a89ab866f5
parent:      80617:74d8a2a20c52
parent:      80614:6f3d3003acf3
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 02:46:25 2012 -0800
summary:
  Merge heads.

files:
  Doc/c-api/unicode.rst |  46 ++++++++++++++++--------------
  1 files changed, 25 insertions(+), 21 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -735,15 +735,18 @@
 The current locale encoding can be used to decode text from the operating
 system.
 
-.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, Py_ssize_t len, int surrogateescape)
-
-   Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`) to escape undecodable
-   bytes. If a byte sequence can be decoded as a surrogate character and
-   *surrogateescape* is not equal to zero, the byte sequence is escaped using
-   the ``'surrogateescape'`` error handler instead of being decoded.  *str*
-   must end with a null character but cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_DecodeLocaleAndSize(const char *str, \
+                                                        Py_ssize_t len, \
+                                                        const char *errors)
+
+   Decode a string from the current locale encoding. The supported
+   error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The decoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. If a byte sequence can be decoded as a
+   surrogate character and *errors* is not ``"strict"``, then the byte
+   sequence is escaped using the ``"surrogateescape"`` error handler
+   instead of being decoded. *str* must end with a null character but
+   cannot contain embedded null characters.
 
    .. seealso::
 
@@ -754,7 +757,7 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, int surrogateescape)
+.. c:function:: PyObject* PyUnicode_DecodeLocale(const char *str, const char *errors)
 
    Similar to :c:func:`PyUnicode_DecodeLocaleAndSize`, but compute the string
    length using :c:func:`strlen`.
@@ -762,12 +765,13 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, int surrogateescape)
-
-   Encode a Unicode object to the current locale encoding. The encoder is
-   strict if *surrogateescape* is equal to zero, otherwise it uses the
-   ``'surrogateescape'`` error handler (:pep:`383`). Return a :class:`bytes`
-   object. *str* cannot contain embedded null characters.
+.. c:function:: PyObject* PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
+
+   Encode a Unicode object to the current locale encoding. The
+   supported error handlers are ``"strict"`` and ``"surrogateescape"``
+   (:pep:`383`). The encoder uses ``"strict"`` error handler if
+   *errors* is ``NULL``. Return a :class:`bytes` object. *str* cannot
+   contain embedded null characters.
 
    .. seealso::
 
@@ -813,7 +817,7 @@
 .. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
 
    Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -826,13 +830,13 @@
       :c:func:`PyUnicode_DecodeLocaleAndSize`.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s)
 
    Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding`
-   and the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows.
+   and the ``"surrogateescape"`` error handler, or ``"strict"`` on Windows.
 
    If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the
    locale encoding.
@@ -840,13 +844,13 @@
    Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length.
 
    .. versionchanged:: 3.2
-      Use ``'strict'`` error handler on Windows.
+      Use ``"strict"`` error handler on Windows.
 
 
 .. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode)
 
    Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the
-   ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return
+   ``"surrogateescape"`` error handler, or ``"strict"`` on Windows, and return
    :class:`bytes`. Note that the resulting :class:`bytes` object may contain
    null bytes.
 

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

From python-checkins at python.org  Wed Nov 28 11:53:05 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Wed, 28 Nov 2012 11:53:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Null_merge_from_3=2E3=2E?=
Message-ID: <3YBJcK0Z4JzRTH@mail.python.org>

http://hg.python.org/cpython/rev/1d515909e624
changeset:   80620:1d515909e624
parent:      80619:a8a89ab866f5
parent:      80618:f18793b103de
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 02:47:45 2012 -0800
summary:
  Null merge from 3.3.

files:



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

From python-checkins at python.org  Wed Nov 28 18:18:36 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 18:18:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzExMDc2?=
 =?utf-8?q?=3A_document_the_way_to_convert_argparse=2ENamespace_to_a_dict?=
 =?utf-8?q?=2E?=
Message-ID: <3YBT984PR5zQJt@mail.python.org>

http://hg.python.org/cpython/rev/bbecbcff0ce4
changeset:   80621:bbecbcff0ce4
branch:      3.2
parent:      80615:69d5d834c5cb
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 19:17:26 2012 +0200
summary:
  Issue #11076: document the way to convert argparse.Namespace to a dict.

Initial patch by Virgil Dupras.

files:
  Doc/library/argparse.rst |  15 +++++++++++++++
  1 files changed, 15 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
@@ -1425,6 +1425,21 @@
    'BAR'
 
 
+Converting the namespace to a dict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+It's possible to convert a namespace to a :class:`dict` by using the built-in
+function :func:`vars` in this fashion::
+
+    args = parser.parse_args()
+    argdict = vars(args)
+
+This makes it easy to introspect the namespace or to pass the command-line
+arguments to a function taking a bunch of keyword arguments::
+
+    somefunction(**vars(parser.parse_args()))
+
+
 Other utilities
 ---------------
 

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

From python-checkins at python.org  Wed Nov 28 18:18:37 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 18:18:37 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=2311076=3A_document_the_way_to_convert_argparse?=
 =?utf-8?q?=2ENamespace_to_a_dict=2E?=
Message-ID: <3YBT9974J9zQJt@mail.python.org>

http://hg.python.org/cpython/rev/ee4e31845977
changeset:   80622:ee4e31845977
branch:      3.3
parent:      80618:f18793b103de
parent:      80621:bbecbcff0ce4
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 19:18:09 2012 +0200
summary:
  Merge issue #11076: document the way to convert argparse.Namespace to a dict.

Initial patch by Virgil Dupras.

files:
  Doc/library/argparse.rst |  15 +++++++++++++++
  1 files changed, 15 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
@@ -1444,6 +1444,21 @@
    'BAR'
 
 
+Converting the namespace to a dict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+It's possible to convert a namespace to a :class:`dict` by using the built-in
+function :func:`vars` in this fashion::
+
+    args = parser.parse_args()
+    argdict = vars(args)
+
+This makes it easy to introspect the namespace or to pass the command-line
+arguments to a function taking a bunch of keyword arguments::
+
+    somefunction(**vars(parser.parse_args()))
+
+
 Other utilities
 ---------------
 

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

From python-checkins at python.org  Wed Nov 28 18:18:39 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 18:18:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2311076=3A_document_the_way_to_convert_argp?=
 =?utf-8?q?arse=2ENamespace_to_a_dict=2E?=
Message-ID: <3YBT9C2F82zRJ7@mail.python.org>

http://hg.python.org/cpython/rev/63ff2d421d1a
changeset:   80623:63ff2d421d1a
parent:      80620:1d515909e624
parent:      80622:ee4e31845977
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 19:18:25 2012 +0200
summary:
  Merge issue #11076: document the way to convert argparse.Namespace to a dict.

Initial patch by Virgil Dupras.

files:
  Doc/library/argparse.rst |  15 +++++++++++++++
  1 files changed, 15 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
@@ -1444,6 +1444,21 @@
    'BAR'
 
 
+Converting the namespace to a dict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+It's possible to convert a namespace to a :class:`dict` by using the built-in
+function :func:`vars` in this fashion::
+
+    args = parser.parse_args()
+    argdict = vars(args)
+
+This makes it easy to introspect the namespace or to pass the command-line
+arguments to a function taking a bunch of keyword arguments::
+
+    somefunction(**vars(parser.parse_args()))
+
+
 Other utilities
 ---------------
 

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

From python-checkins at python.org  Wed Nov 28 18:26:20 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 18:26:20 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Revert_duplica?=
 =?utf-8?q?te_changes_in_argparse_docs=2E?=
Message-ID: <3YBTL43rpHzQQg@mail.python.org>

http://hg.python.org/cpython/rev/c008f070f88a
changeset:   80624:c008f070f88a
branch:      3.2
parent:      80621:bbecbcff0ce4
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 19:23:52 2012 +0200
summary:
  Revert duplicate changes in argparse docs.

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


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1425,21 +1425,6 @@
    'BAR'
 
 
-Converting the namespace to a dict
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-It's possible to convert a namespace to a :class:`dict` by using the built-in
-function :func:`vars` in this fashion::
-
-    args = parser.parse_args()
-    argdict = vars(args)
-
-This makes it easy to introspect the namespace or to pass the command-line
-arguments to a function taking a bunch of keyword arguments::
-
-    somefunction(**vars(parser.parse_args()))
-
-
 Other utilities
 ---------------
 

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

From python-checkins at python.org  Wed Nov 28 18:26:21 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 18:26:21 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Revert_duplicate_changes_in_argparse_docs=2E?=
Message-ID: <3YBTL56MqXzQQn@mail.python.org>

http://hg.python.org/cpython/rev/814403d824a5
changeset:   80625:814403d824a5
branch:      3.3
parent:      80622:ee4e31845977
parent:      80624:c008f070f88a
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 19:24:31 2012 +0200
summary:
  Revert duplicate changes in argparse docs.

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


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1444,21 +1444,6 @@
    'BAR'
 
 
-Converting the namespace to a dict
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-It's possible to convert a namespace to a :class:`dict` by using the built-in
-function :func:`vars` in this fashion::
-
-    args = parser.parse_args()
-    argdict = vars(args)
-
-This makes it easy to introspect the namespace or to pass the command-line
-arguments to a function taking a bunch of keyword arguments::
-
-    somefunction(**vars(parser.parse_args()))
-
-
 Other utilities
 ---------------
 

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

From python-checkins at python.org  Wed Nov 28 18:26:23 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Wed, 28 Nov 2012 18:26:23 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Revert_duplicate_changes_in_argparse_docs=2E?=
Message-ID: <3YBTL71XsRzQS1@mail.python.org>

http://hg.python.org/cpython/rev/ddcf09a348ca
changeset:   80626:ddcf09a348ca
parent:      80623:63ff2d421d1a
parent:      80625:814403d824a5
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Wed Nov 28 19:24:44 2012 +0200
summary:
  Revert duplicate changes in argparse docs.

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


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1444,21 +1444,6 @@
    'BAR'
 
 
-Converting the namespace to a dict
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-It's possible to convert a namespace to a :class:`dict` by using the built-in
-function :func:`vars` in this fashion::
-
-    args = parser.parse_args()
-    argdict = vars(args)
-
-This makes it easy to introspect the namespace or to pass the command-line
-arguments to a function taking a bunch of keyword arguments::
-
-    somefunction(**vars(parser.parse_args()))
-
-
 Other utilities
 ---------------
 

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

From python-checkins at python.org  Wed Nov 28 23:43:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 28 Nov 2012 23:43:13 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MzMzOiBkb2N1?=
 =?utf-8?q?ment_a_way_to_get_rid_of_trailing_whitespace_when_indent_is_use?=
 =?utf-8?q?d=2E?=
Message-ID: <3YBcMj5B7XzRKS@mail.python.org>

http://hg.python.org/cpython/rev/78bad589f205
changeset:   80627:78bad589f205
branch:      2.7
parent:      80609:57c157be847f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 00:22:30 2012 +0200
summary:
  #16333: document a way to get rid of trailing whitespace when indent is used.

files:
  Doc/library/json.rst |  15 ++++++++++++++-
  Lib/json/__init__.py |  12 ++++++++----
  Lib/json/encoder.py  |   5 ++++-
  3 files changed, 26 insertions(+), 6 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -43,7 +43,8 @@
 Pretty printing::
 
     >>> import json
-    >>> print json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4)
+    >>> print json.dumps({'4': 5, '6': 7}, sort_keys=True,
+    ...                  indent=4, separators=(',', ': '))
     {
         "4": 5,
         "6": 7
@@ -153,6 +154,12 @@
    or negative, will only insert newlines.  ``None`` (the default) selects the
    most compact representation.
 
+   .. note::
+
+      Since the default item separator is ``', '``,  the output might include
+      trailing whitespace when *indent* is specified.  You can use
+      ``separators=(',', ': ')`` to avoid this.
+
    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.
@@ -410,6 +417,12 @@
    level.  An indent level of 0 will only insert newlines.  ``None`` is the most
    compact representation.
 
+   .. note::
+
+      Since the default item separator is ``', '``,  the output might include
+      trailing whitespace when *indent* is specified.  You can use
+      ``separators=(',', ': ')`` to avoid this.
+
    If specified, *separators* should be an ``(item_separator, key_separator)``
    tuple.  The default is ``(', ', ': ')``.  To get the most compact JSON
    representation, you should specify ``(',', ':')`` to eliminate whitespace.
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -37,8 +37,8 @@
 Pretty printing::
 
     >>> import json
-    >>> s = json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4)
-    >>> print '\n'.join([l.rstrip() for l in  s.splitlines()])
+    >>> print json.dumps({'4': 5, '6': 7}, sort_keys=True,
+    ...                  indent=4, separators=(',', ': '))
     {
         "4": 5,
         "6": 7
@@ -150,7 +150,9 @@
     If ``indent`` is a non-negative integer, 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.
+    representation.  Since the default item separator is ``', '``,  the
+    output might include trailing whitespace when ``indent`` is specified.
+    You can use ``separators=(',', ': ')`` to avoid this.
 
     If ``separators`` is an ``(item_separator, dict_separator)`` tuple
     then it will be used instead of the default ``(', ', ': ')`` separators.
@@ -212,7 +214,9 @@
     If ``indent`` is a non-negative integer, 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.
+    representation.  Since the default item separator is ``', '``,  the
+    output might include trailing whitespace when ``indent`` is specified.
+    You can use ``separators=(',', ': ')`` to avoid this.
 
     If ``separators`` is an ``(item_separator, dict_separator)`` tuple
     then it will be used instead of the default ``(', ', ': ')`` separators.
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -131,7 +131,10 @@
         If indent is a non-negative integer, 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.
+        None is the most compact representation.  Since the default
+        item separator is ', ',  the output might include trailing
+        whitespace when indent is specified.  You can use
+        separators=(',', ': ') to avoid this.
 
         If specified, separators should be a (item_separator, key_separator)
         tuple.  The default is (', ', ': ').  To get the most compact JSON

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

From python-checkins at python.org  Wed Nov 28 23:43:15 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 28 Nov 2012 23:43:15 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MzMzOiBkb2N1?=
 =?utf-8?q?ment_a_way_to_get_rid_of_trailing_whitespace_when_indent_is_use?=
 =?utf-8?q?d=2E?=
Message-ID: <3YBcMl1jQrzRQD@mail.python.org>

http://hg.python.org/cpython/rev/2a5b183ac3cd
changeset:   80628:2a5b183ac3cd
branch:      3.2
parent:      80624:c008f070f88a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 00:35:29 2012 +0200
summary:
  #16333: document a way to get rid of trailing whitespace when indent is used.

files:
  Doc/library/json.rst |  15 ++++++++++++++-
  Lib/json/__init__.py |  12 ++++++++----
  Lib/json/encoder.py  |   5 ++++-
  3 files changed, 26 insertions(+), 6 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -42,7 +42,8 @@
 Pretty printing::
 
     >>> import json
-    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4))
+    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True,
+    ...                  indent=4, separators=(',', ': ')))
     {
         "4": 5,
         "6": 7
@@ -155,6 +156,12 @@
    .. versionchanged:: 3.2
       Allow strings for *indent* in addition to integers.
 
+   .. note::
+
+      Since the default item separator is ``', '``,  the output might include
+      trailing whitespace when *indent* is specified.  You can use
+      ``separators=(',', ': ')`` to avoid this.
+
    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.
@@ -393,6 +400,12 @@
    .. versionchanged:: 3.2
       Allow strings for *indent* in addition to integers.
 
+   .. note::
+
+      Since the default item separator is ``', '``,  the output might include
+      trailing whitespace when *indent* is specified.  You can use
+      ``separators=(',', ': ')`` to avoid this.
+
    If specified, *separators* should be an ``(item_separator, key_separator)``
    tuple.  The default is ``(', ', ': ')``.  To get the most compact JSON
    representation, you should specify ``(',', ':')`` to eliminate whitespace.
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -39,8 +39,8 @@
 Pretty printing::
 
     >>> import json
-    >>> s = json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4)
-    >>> print('\n'.join([l.rstrip() for l in  s.splitlines()]))
+    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True,
+    ...                  indent=4, separators=(',', ': ')))
     {
         "4": 5,
         "6": 7
@@ -146,7 +146,9 @@
     If ``indent`` is a non-negative integer, 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.
+    representation.  Since the default item separator is ``', '``,  the
+    output might include trailing whitespace when ``indent`` is specified.
+    You can use ``separators=(',', ': ')`` to avoid this.
 
     If ``separators`` is an ``(item_separator, dict_separator)`` tuple
     then it will be used instead of the default ``(', ', ': ')`` separators.
@@ -207,7 +209,9 @@
     If ``indent`` is a non-negative integer, 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.
+    representation.  Since the default item separator is ``', '``,  the
+    output might include trailing whitespace when ``indent`` is specified.
+    You can use ``separators=(',', ': ')`` to avoid this.
 
     If ``separators`` is an ``(item_separator, dict_separator)`` tuple
     then it will be used instead of the default ``(', ', ': ')`` separators.
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -125,7 +125,10 @@
         If indent is a non-negative integer, 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.
+        None is the most compact representation.  Since the default
+        item separator is ', ',  the output might include trailing
+        whitespace when indent is specified.  You can use
+        separators=(',', ': ') to avoid this.
 
         If specified, separators should be a (item_separator, key_separator)
         tuple.  The default is (', ', ': ').  To get the most compact JSON

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

From python-checkins at python.org  Wed Nov 28 23:43:16 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 28 Nov 2012 23:43:16 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316333=3A_merge_with_3=2E2=2E?=
Message-ID: <3YBcMm54lNzRQM@mail.python.org>

http://hg.python.org/cpython/rev/9d6706b6b482
changeset:   80629:9d6706b6b482
branch:      3.3
parent:      80625:814403d824a5
parent:      80628:2a5b183ac3cd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 00:36:42 2012 +0200
summary:
  #16333: merge with 3.2.

files:
  Doc/library/json.rst |  15 ++++++++++++++-
  Lib/json/__init__.py |  12 ++++++++----
  Lib/json/encoder.py  |   5 ++++-
  3 files changed, 26 insertions(+), 6 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -42,7 +42,8 @@
 Pretty printing::
 
     >>> import json
-    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4))
+    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True,
+    ...                  indent=4, separators=(',', ': ')))
     {
         "4": 5,
         "6": 7
@@ -155,6 +156,12 @@
    .. versionchanged:: 3.2
       Allow strings for *indent* in addition to integers.
 
+   .. note::
+
+      Since the default item separator is ``', '``,  the output might include
+      trailing whitespace when *indent* is specified.  You can use
+      ``separators=(',', ': ')`` to avoid this.
+
    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.
@@ -393,6 +400,12 @@
    .. versionchanged:: 3.2
       Allow strings for *indent* in addition to integers.
 
+   .. note::
+
+      Since the default item separator is ``', '``,  the output might include
+      trailing whitespace when *indent* is specified.  You can use
+      ``separators=(',', ': ')`` to avoid this.
+
    If specified, *separators* should be an ``(item_separator, key_separator)``
    tuple.  The default is ``(', ', ': ')``.  To get the most compact JSON
    representation, you should specify ``(',', ':')`` to eliminate whitespace.
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -39,8 +39,8 @@
 Pretty printing::
 
     >>> import json
-    >>> s = json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4)
-    >>> print('\n'.join([l.rstrip() for l in  s.splitlines()]))
+    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True,
+    ...                  indent=4, separators=(',', ': ')))
     {
         "4": 5,
         "6": 7
@@ -146,7 +146,9 @@
     If ``indent`` is a non-negative integer, 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.
+    representation.  Since the default item separator is ``', '``,  the
+    output might include trailing whitespace when ``indent`` is specified.
+    You can use ``separators=(',', ': ')`` to avoid this.
 
     If ``separators`` is an ``(item_separator, dict_separator)`` tuple
     then it will be used instead of the default ``(', ', ': ')`` separators.
@@ -207,7 +209,9 @@
     If ``indent`` is a non-negative integer, 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.
+    representation.  Since the default item separator is ``', '``,  the
+    output might include trailing whitespace when ``indent`` is specified.
+    You can use ``separators=(',', ': ')`` to avoid this.
 
     If ``separators`` is an ``(item_separator, dict_separator)`` tuple
     then it will be used instead of the default ``(', ', ': ')`` separators.
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -125,7 +125,10 @@
         If indent is a non-negative integer, 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.
+        None is the most compact representation.  Since the default
+        item separator is ', ',  the output might include trailing
+        whitespace when indent is specified.  You can use
+        separators=(',', ': ') to avoid this.
 
         If specified, separators should be a (item_separator, key_separator)
         tuple.  The default is (', ', ': ').  To get the most compact JSON

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

From python-checkins at python.org  Wed Nov 28 23:43:18 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 28 Nov 2012 23:43:18 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_=2316333=3A_null_merge_with_3=2E3=2E?=
Message-ID: <3YBcMp0DZxzRRQ@mail.python.org>

http://hg.python.org/cpython/rev/8b30a764b58d
changeset:   80630:8b30a764b58d
parent:      80626:ddcf09a348ca
parent:      80629:9d6706b6b482
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 00:37:52 2012 +0200
summary:
  #16333: null merge with 3.3.

files:



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

From python-checkins at python.org  Wed Nov 28 23:43:19 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 28 Nov 2012 23:43:19 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbjogIzE2MzMzOiB1c2UgKCIsIiwg?=
 =?utf-8?q?=22=3A_=22=29_as_default_separator_when_indent_is_specified_to_?=
 =?utf-8?q?avoid?=
Message-ID: <3YBcMq3fNGzRPN@mail.python.org>

http://hg.python.org/cpython/rev/e63ac05ccfa8
changeset:   80631:e63ac05ccfa8
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 00:42:56 2012 +0200
summary:
  #16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace.  Patch by Serhiy Storchaka.

files:
  Doc/library/json.rst               |  18 +++++++++++++-----
  Lib/json/__init__.py               |  14 ++++++++------
  Lib/json/encoder.py                |   9 ++++++---
  Lib/test/json_tests/test_indent.py |   4 ++++
  4 files changed, 31 insertions(+), 14 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -155,9 +155,13 @@
    .. 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.
+   If specified, *separators* should be an ``(item_separator, key_separator)``
+   tuple.  The default is ``(', ', ': ')`` if *indent* is ``None`` and
+   ``(',', ': ')`` otherwise.  To get the most compact JSON representation,
+   you should specify ``(',', ':')`` to eliminate whitespace.
+
+   .. versionchanged:: 3.4
+      Use ``(',', ': ')`` as default if *indent* is not ``None``.
 
    *default(obj)* is a function that should return a serializable version of
    *obj* or raise :exc:`TypeError`.  The default simply raises :exc:`TypeError`.
@@ -394,8 +398,12 @@
       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
-   representation, you should specify ``(',', ':')`` to eliminate whitespace.
+   tuple.  The default is ``(', ', ': ')`` if *indent* is ``None`` and
+   ``(',', ': ')`` otherwise.  To get the most compact JSON representation,
+   you should specify ``(',', ':')`` to eliminate whitespace.
+
+   .. versionchanged:: 3.4
+      Use ``(',', ': ')`` as default if *indent* is not ``None``.
 
    If specified, *default* is a function that gets called for objects that can't
    otherwise be serialized.  It should return a JSON encodable version of the
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -148,9 +148,10 @@
     level of 0 will only insert newlines. ``None`` is the most compact
     representation.
 
-    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.
+    If specified, ``separators`` should be an ``(item_separator, key_separator)``
+    tuple.  The default is ``(', ', ': ')`` if *indent* is ``None`` and
+    ``(',', ': ')`` otherwise.  To get the most compact JSON representation,
+    you should specify ``(',', ':')`` to eliminate whitespace.
 
     ``default(obj)`` is a function that should return a serializable version
     of obj or raise TypeError. The default simply raises TypeError.
@@ -209,9 +210,10 @@
     level of 0 will only insert newlines. ``None`` is the most compact
     representation.
 
-    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.
+    If specified, ``separators`` should be an ``(item_separator, key_separator)``
+    tuple.  The default is ``(', ', ': ')`` if *indent* is ``None`` and
+    ``(',', ': ')`` otherwise.  To get the most compact JSON representation,
+    you should specify ``(',', ':')`` to eliminate whitespace.
 
     ``default(obj)`` is a function that should return a serializable version
     of obj or raise TypeError. The default simply raises TypeError.
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -127,9 +127,10 @@
         indent level.  An indent level of 0 will only insert newlines.
         None is the most compact representation.
 
-        If specified, separators should be a (item_separator, key_separator)
-        tuple.  The default is (', ', ': ').  To get the most compact JSON
-        representation you should specify (',', ':') to eliminate whitespace.
+        If specified, separators should be an (item_separator, key_separator)
+        tuple.  The default is (', ', ': ') if *indent* is ``None`` and
+        (',', ': ') otherwise.  To get the most compact JSON representation,
+        you should specify (',', ':') to eliminate whitespace.
 
         If specified, default is a function that gets called for objects
         that can't otherwise be serialized.  It should return a JSON encodable
@@ -145,6 +146,8 @@
         self.indent = indent
         if separators is not None:
             self.item_separator, self.key_separator = separators
+        elif indent is not None:
+            self.item_separator = ','
         if default is not None:
             self.default = default
 
diff --git a/Lib/test/json_tests/test_indent.py b/Lib/test/json_tests/test_indent.py
--- a/Lib/test/json_tests/test_indent.py
+++ b/Lib/test/json_tests/test_indent.py
@@ -32,6 +32,8 @@
         d1 = self.dumps(h)
         d2 = self.dumps(h, indent=2, sort_keys=True, separators=(',', ': '))
         d3 = self.dumps(h, indent='\t', sort_keys=True, separators=(',', ': '))
+        d4 = self.dumps(h, indent=2, sort_keys=True)
+        d5 = self.dumps(h, indent='\t', sort_keys=True)
 
         h1 = self.loads(d1)
         h2 = self.loads(d2)
@@ -42,6 +44,8 @@
         self.assertEqual(h3, h)
         self.assertEqual(d2, expect.expandtabs(2))
         self.assertEqual(d3, expect)
+        self.assertEqual(d4, d2)
+        self.assertEqual(d5, d3)
 
     def test_indent0(self):
         h = {3: 1}

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

From python-checkins at python.org  Wed Nov 28 23:45:36 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 28 Nov 2012 23:45:36 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316333=3A_fix_example_in?=
	=?utf-8?q?_docstring=2E?=
Message-ID: <3YBcQS0l1JzRKS@mail.python.org>

http://hg.python.org/cpython/rev/e7919cf9b5e5
changeset:   80632:e7919cf9b5e5
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 00:45:22 2012 +0200
summary:
  #16333: fix example in docstring.

files:
  Lib/json/__init__.py |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -39,8 +39,7 @@
 Pretty printing::
 
     >>> import json
-    >>> s = json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4)
-    >>> print('\n'.join([l.rstrip() for l in  s.splitlines()]))
+    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4))
     {
         "4": 5,
         "6": 7

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

From python-checkins at python.org  Thu Nov 29 00:13:22 2012
From: python-checkins at python.org (victor.stinner)
Date: Thu, 29 Nov 2012 00:13:22 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Cleanup_json_decoder=3A_fl?=
 =?utf-8?q?oat=28=29_has_builtin_support_of_nan=2C_+inf=2C_-inf_since?=
Message-ID: <3YBd2V6rhkzM1X@mail.python.org>

http://hg.python.org/cpython/rev/402bae9f8fe5
changeset:   80633:402bae9f8fe5
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Nov 29 00:12:40 2012 +0100
summary:
  Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6

files:
  Lib/json/decoder.py |  14 +++-----------
  1 files changed, 3 insertions(+), 11 deletions(-)


diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -1,9 +1,6 @@
 """Implementation of JSONDecoder
 """
-import binascii
 import re
-import sys
-import struct
 
 from json import scanner
 try:
@@ -15,14 +12,9 @@
 
 FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
 
-def _floatconstants():
-    _BYTES = binascii.unhexlify(b'7FF80000000000007FF0000000000000')
-    if sys.byteorder != 'big':
-        _BYTES = _BYTES[:8][::-1] + _BYTES[8:][::-1]
-    nan, inf = struct.unpack('dd', _BYTES)
-    return nan, inf, -inf
-
-NaN, PosInf, NegInf = _floatconstants()
+NaN = float('nan')
+PosInf = float('inf')
+NegInf = float('-inf')
 
 
 def linecol(doc, pos):

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

From python-checkins at python.org  Thu Nov 29 00:18:11 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu, 29 Nov 2012 00:18:11 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2NTM0?=
 =?utf-8?q?=3A_On_HP-UX_ac=5Fcv=5Folimit=5Fok=3Dyes_is_a_false_positive=2E?=
Message-ID: <3YBd836QxpzQLc@mail.python.org>

http://hg.python.org/cpython/rev/5697387b0089
changeset:   80634:5697387b0089
branch:      2.7
parent:      80627:78bad589f205
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Nov 29 00:17:05 2012 +0100
summary:
  Issue #16534: On HP-UX ac_cv_olimit_ok=yes is a false positive.

files:
  configure    |  9 ++++++++-
  configure.ac |  9 ++++++++-
  2 files changed, 16 insertions(+), 2 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5792,7 +5792,14 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_olimit_ok" >&5
 $as_echo "$ac_cv_olimit_ok" >&6; }
   if test $ac_cv_olimit_ok = yes; then
-    BASECFLAGS="$BASECFLAGS -Olimit 1500"
+    case $ac_sys_system in
+        # Issue #16534: On HP-UX ac_cv_olimit_ok=yes is a false positive.
+        HP-UX*)
+            ;;
+        *)
+            BASECFLAGS="$BASECFLAGS -Olimit 1500"
+            ;;
+    esac
   fi
 fi
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1203,7 +1203,14 @@
   CC="$ac_save_cc"])
   AC_MSG_RESULT($ac_cv_olimit_ok)
   if test $ac_cv_olimit_ok = yes; then
-    BASECFLAGS="$BASECFLAGS -Olimit 1500"
+    case $ac_sys_system in
+        # Issue #16534: On HP-UX ac_cv_olimit_ok=yes is a false positive.
+        HP-UX*)
+            ;;
+        *)
+            BASECFLAGS="$BASECFLAGS -Olimit 1500"
+            ;;
+    esac
   fi
 fi
 

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

From python-checkins at python.org  Thu Nov 29 01:27:47 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NTQ5OiBBZGQg?=
 =?utf-8?q?tests_for_json=2Etools=2E__Initial_patch_by_Berker_Peksag_and_S?=
 =?utf-8?q?erhiy?=
Message-ID: <3YBfhM74NBzRRq@mail.python.org>

http://hg.python.org/cpython/rev/08e5973fdc7e
changeset:   80635:08e5973fdc7e
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:14:52 2012 +0200
summary:
  #16549: Add tests for json.tools.  Initial patch by Berker Peksag and Serhiy Storchaka.

files:
  Lib/json/tests/test_tool.py |  69 +++++++++++++++++++++++++
  Lib/json/tool.py            |  14 ++--
  Misc/ACKS                   |   1 +
  Misc/NEWS                   |   3 +
  4 files changed, 81 insertions(+), 6 deletions(-)


diff --git a/Lib/json/tests/test_tool.py b/Lib/json/tests/test_tool.py
new file mode 100644
--- /dev/null
+++ b/Lib/json/tests/test_tool.py
@@ -0,0 +1,69 @@
+import os
+import sys
+import textwrap
+import unittest
+import subprocess
+from test import test_support
+from test.script_helper import assert_python_ok
+
+class TestTool(unittest.TestCase):
+    data = """
+
+        [["blorpie"],[ "whoops" ] , [
+                                 ],\t"d-shtaeou",\r"d-nthiouh",
+        "i-vhbjkhnth", {"nifty":87}, {"morefield" :\tfalse,"field"
+            :"yes"}  ]
+           """
+
+    expect = textwrap.dedent("""\
+    [
+        [
+            "blorpie"
+        ], 
+        [
+            "whoops"
+        ], 
+        [], 
+        "d-shtaeou", 
+        "d-nthiouh", 
+        "i-vhbjkhnth", 
+        {
+            "nifty": 87
+        }, 
+        {
+            "field": "yes", 
+            "morefield": false
+        }
+    ]
+    """)
+
+    def test_stdin_stdout(self):
+        proc = subprocess.Popen(
+                (sys.executable, '-m', 'json.tool'),
+                stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        out, err = proc.communicate(self.data.encode())
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, None)
+
+    def _create_infile(self):
+        infile = test_support.TESTFN
+        with open(infile, "w") as fp:
+            self.addCleanup(os.remove, infile)
+            fp.write(self.data)
+        return infile
+
+    def test_infile_stdout(self):
+        infile = self._create_infile()
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile)
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, b'')
+
+    def test_infile_outfile(self):
+        infile = self._create_infile()
+        outfile = test_support.TESTFN + '.out'
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile, outfile)
+        self.addCleanup(os.remove, outfile)
+        with open(outfile, "r") as fp:
+            self.assertEqual(fp.read(), self.expect)
+        self.assertEqual(out, b'')
+        self.assertEqual(err, b'')
diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -25,12 +25,14 @@
         outfile = open(sys.argv[2], 'wb')
     else:
         raise SystemExit(sys.argv[0] + " [infile [outfile]]")
-    try:
-        obj = json.load(infile)
-    except ValueError, e:
-        raise SystemExit(e)
-    json.dump(obj, outfile, sort_keys=True, indent=4)
-    outfile.write('\n')
+    with infile:
+        try:
+            obj = json.load(infile)
+        except ValueError, e:
+            raise SystemExit(e)
+    with outfile:
+        json.dump(obj, outfile, sort_keys=True, indent=4)
+        outfile.write('\n')
 
 
 if __name__ == '__main__':
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -751,6 +751,7 @@
 Randy Pausch
 Samuele Pedroni
 Marcel van der Peijl
+Berker Peksag
 Steven Pemberton
 Bo Peng
 Santiago Peres?n
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -521,6 +521,9 @@
 Tests
 -----
 
+- Issue #16549: Add tests for json.tools.  Initial patch by Berker Peksag
+  and Serhiy Storchaka.
+
 - Issue #16559: Add more tests for the json module, including some from the
   official test suite at json.org.  Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov 29 01:27:49 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NTQ5OiBNYWtl?=
 =?utf-8?q?_json=2Etool_work_again_on_Python_3_and_add_tests=2E__Initial_p?=
 =?utf-8?q?atch_by?=
Message-ID: <3YBfhP3Xs8zRSs@mail.python.org>

http://hg.python.org/cpython/rev/44c544809e6c
changeset:   80636:44c544809e6c
branch:      3.2
parent:      80628:2a5b183ac3cd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:15:18 2012 +0200
summary:
  #16549: Make json.tool work again on Python 3 and add tests.  Initial patch by Berker Peksag and Serhiy Storchaka.

files:
  Lib/json/tool.py                 |  20 +++--
  Lib/test/json_tests/test_tool.py |  69 ++++++++++++++++++++
  Misc/ACKS                        |   1 +
  Misc/NEWS                        |   3 +
  4 files changed, 84 insertions(+), 9 deletions(-)


diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -18,19 +18,21 @@
         infile = sys.stdin
         outfile = sys.stdout
     elif len(sys.argv) == 2:
-        infile = open(sys.argv[1], 'rb')
+        infile = open(sys.argv[1], 'r')
         outfile = sys.stdout
     elif len(sys.argv) == 3:
-        infile = open(sys.argv[1], 'rb')
-        outfile = open(sys.argv[2], 'wb')
+        infile = open(sys.argv[1], 'r')
+        outfile = open(sys.argv[2], 'w')
     else:
         raise SystemExit(sys.argv[0] + " [infile [outfile]]")
-    try:
-        obj = json.load(infile)
-    except ValueError as e:
-        raise SystemExit(e)
-    json.dump(obj, outfile, sort_keys=True, indent=4)
-    outfile.write('\n')
+    with infile:
+        try:
+            obj = json.load(infile)
+        except ValueError as e:
+            raise SystemExit(e)
+    with outfile:
+        json.dump(obj, outfile, sort_keys=True, indent=4)
+        outfile.write('\n')
 
 
 if __name__ == '__main__':
diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/json_tests/test_tool.py
@@ -0,0 +1,69 @@
+import os
+import sys
+import textwrap
+import unittest
+import subprocess
+from test import support
+from test.script_helper import assert_python_ok
+
+class TestTool(unittest.TestCase):
+    data = """
+
+        [["blorpie"],[ "whoops" ] , [
+                                 ],\t"d-shtaeou",\r"d-nthiouh",
+        "i-vhbjkhnth", {"nifty":87}, {"morefield" :\tfalse,"field"
+            :"yes"}  ]
+           """
+
+    expect = textwrap.dedent("""\
+    [
+        [
+            "blorpie"
+        ], 
+        [
+            "whoops"
+        ], 
+        [], 
+        "d-shtaeou", 
+        "d-nthiouh", 
+        "i-vhbjkhnth", 
+        {
+            "nifty": 87
+        }, 
+        {
+            "field": "yes", 
+            "morefield": false
+        }
+    ]
+    """)
+
+    def test_stdin_stdout(self):
+        with subprocess.Popen(
+                (sys.executable, '-m', 'json.tool'),
+                stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
+            out, err = proc.communicate(self.data.encode())
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, None)
+
+    def _create_infile(self):
+        infile = support.TESTFN
+        with open(infile, "w") as fp:
+            self.addCleanup(os.remove, infile)
+            fp.write(self.data)
+        return infile
+
+    def test_infile_stdout(self):
+        infile = self._create_infile()
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile)
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, b'')
+
+    def test_infile_outfile(self):
+        infile = self._create_infile()
+        outfile = support.TESTFN + '.out'
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile, outfile)
+        self.addCleanup(os.remove, outfile)
+        with open(outfile, "r") as fp:
+            self.assertEqual(fp.read(), self.expect)
+        self.assertEqual(out, b'')
+        self.assertEqual(err, b'')
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -807,6 +807,7 @@
 Dan Parisien
 William Park
 Harri Pasanen
+Berker Peksag
 Bo Peng
 Joe Peterson
 Randy Pausch
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,9 @@
 Library
 -------
 
+- Issue #16549: Make json.tool work again on Python 3 and add tests.
+  Initial patch by Berker Peksag and Serhiy Storchaka.
+
 - Issue #12848: The pure Python pickle implementation now treats object
   lengths as unsigned 32-bit integers, like the C implementation does.
   Patch by Serhiy Storchaka.

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

From python-checkins at python.org  Thu Nov 29 01:27:50 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:50 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316549=3A_merge_with_3=2E2=2E?=
Message-ID: <3YBfhQ75g6zRTH@mail.python.org>

http://hg.python.org/cpython/rev/1e2ae5e01963
changeset:   80637:1e2ae5e01963
branch:      3.3
parent:      80629:9d6706b6b482
parent:      80636:44c544809e6c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:16:58 2012 +0200
summary:
  #16549: merge with 3.2.

files:
  Lib/json/tool.py                 |  20 +++--
  Lib/test/json_tests/test_tool.py |  69 ++++++++++++++++++++
  Misc/ACKS                        |   1 +
  Misc/NEWS                        |   3 +
  4 files changed, 84 insertions(+), 9 deletions(-)


diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -18,19 +18,21 @@
         infile = sys.stdin
         outfile = sys.stdout
     elif len(sys.argv) == 2:
-        infile = open(sys.argv[1], 'rb')
+        infile = open(sys.argv[1], 'r')
         outfile = sys.stdout
     elif len(sys.argv) == 3:
-        infile = open(sys.argv[1], 'rb')
-        outfile = open(sys.argv[2], 'wb')
+        infile = open(sys.argv[1], 'r')
+        outfile = open(sys.argv[2], 'w')
     else:
         raise SystemExit(sys.argv[0] + " [infile [outfile]]")
-    try:
-        obj = json.load(infile)
-    except ValueError as e:
-        raise SystemExit(e)
-    json.dump(obj, outfile, sort_keys=True, indent=4)
-    outfile.write('\n')
+    with infile:
+        try:
+            obj = json.load(infile)
+        except ValueError as e:
+            raise SystemExit(e)
+    with outfile:
+        json.dump(obj, outfile, sort_keys=True, indent=4)
+        outfile.write('\n')
 
 
 if __name__ == '__main__':
diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/json_tests/test_tool.py
@@ -0,0 +1,69 @@
+import os
+import sys
+import textwrap
+import unittest
+import subprocess
+from test import support
+from test.script_helper import assert_python_ok
+
+class TestTool(unittest.TestCase):
+    data = """
+
+        [["blorpie"],[ "whoops" ] , [
+                                 ],\t"d-shtaeou",\r"d-nthiouh",
+        "i-vhbjkhnth", {"nifty":87}, {"morefield" :\tfalse,"field"
+            :"yes"}  ]
+           """
+
+    expect = textwrap.dedent("""\
+    [
+        [
+            "blorpie"
+        ], 
+        [
+            "whoops"
+        ], 
+        [], 
+        "d-shtaeou", 
+        "d-nthiouh", 
+        "i-vhbjkhnth", 
+        {
+            "nifty": 87
+        }, 
+        {
+            "field": "yes", 
+            "morefield": false
+        }
+    ]
+    """)
+
+    def test_stdin_stdout(self):
+        with subprocess.Popen(
+                (sys.executable, '-m', 'json.tool'),
+                stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
+            out, err = proc.communicate(self.data.encode())
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, None)
+
+    def _create_infile(self):
+        infile = support.TESTFN
+        with open(infile, "w") as fp:
+            self.addCleanup(os.remove, infile)
+            fp.write(self.data)
+        return infile
+
+    def test_infile_stdout(self):
+        infile = self._create_infile()
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile)
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, b'')
+
+    def test_infile_outfile(self):
+        infile = self._create_infile()
+        outfile = support.TESTFN + '.out'
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile, outfile)
+        self.addCleanup(os.remove, outfile)
+        with open(outfile, "r") as fp:
+            self.assertEqual(fp.read(), self.expect)
+        self.assertEqual(out, b'')
+        self.assertEqual(err, b'')
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -889,6 +889,7 @@
 William Park
 Harri Pasanen
 Ga?l Pasgrimaud
+Berker Peksag
 Bo Peng
 Joe Peterson
 Randy Pausch
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,9 @@
 Library
 -------
 
+- Issue #16549: Make json.tool work again on Python 3 and add tests.
+  Initial patch by Berker Peksag and Serhiy Storchaka.
+
 - Issue #12848: The pure Python pickle implementation now treats object
   lengths as unsigned 32-bit integers, like the C implementation does.
   Patch by Serhiy Storchaka.

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

From python-checkins at python.org  Thu Nov 29 01:27:52 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:52 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NTQ5OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3YBfhS3gbRzRT3@mail.python.org>

http://hg.python.org/cpython/rev/cdeca27b32e5
changeset:   80638:cdeca27b32e5
parent:      80633:402bae9f8fe5
parent:      80637:1e2ae5e01963
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:18:34 2012 +0200
summary:
  #16549: merge with 3.3.

files:
  Lib/json/tool.py                 |  20 +++--
  Lib/test/json_tests/test_tool.py |  69 ++++++++++++++++++++
  Misc/ACKS                        |   1 +
  Misc/NEWS                        |   3 +
  4 files changed, 84 insertions(+), 9 deletions(-)


diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -18,19 +18,21 @@
         infile = sys.stdin
         outfile = sys.stdout
     elif len(sys.argv) == 2:
-        infile = open(sys.argv[1], 'rb')
+        infile = open(sys.argv[1], 'r')
         outfile = sys.stdout
     elif len(sys.argv) == 3:
-        infile = open(sys.argv[1], 'rb')
-        outfile = open(sys.argv[2], 'wb')
+        infile = open(sys.argv[1], 'r')
+        outfile = open(sys.argv[2], 'w')
     else:
         raise SystemExit(sys.argv[0] + " [infile [outfile]]")
-    try:
-        obj = json.load(infile)
-    except ValueError as e:
-        raise SystemExit(e)
-    json.dump(obj, outfile, sort_keys=True, indent=4)
-    outfile.write('\n')
+    with infile:
+        try:
+            obj = json.load(infile)
+        except ValueError as e:
+            raise SystemExit(e)
+    with outfile:
+        json.dump(obj, outfile, sort_keys=True, indent=4)
+        outfile.write('\n')
 
 
 if __name__ == '__main__':
diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/json_tests/test_tool.py
@@ -0,0 +1,69 @@
+import os
+import sys
+import textwrap
+import unittest
+import subprocess
+from test import support
+from test.script_helper import assert_python_ok
+
+class TestTool(unittest.TestCase):
+    data = """
+
+        [["blorpie"],[ "whoops" ] , [
+                                 ],\t"d-shtaeou",\r"d-nthiouh",
+        "i-vhbjkhnth", {"nifty":87}, {"morefield" :\tfalse,"field"
+            :"yes"}  ]
+           """
+
+    expect = textwrap.dedent("""\
+    [
+        [
+            "blorpie"
+        ],
+        [
+            "whoops"
+        ],
+        [],
+        "d-shtaeou",
+        "d-nthiouh",
+        "i-vhbjkhnth",
+        {
+            "nifty": 87
+        },
+        {
+            "field": "yes",
+            "morefield": false
+        }
+    ]
+    """)
+
+    def test_stdin_stdout(self):
+        with subprocess.Popen(
+                (sys.executable, '-m', 'json.tool'),
+                stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
+            out, err = proc.communicate(self.data.encode())
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, None)
+
+    def _create_infile(self):
+        infile = support.TESTFN
+        with open(infile, "w") as fp:
+            self.addCleanup(os.remove, infile)
+            fp.write(self.data)
+        return infile
+
+    def test_infile_stdout(self):
+        infile = self._create_infile()
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile)
+        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(err, b'')
+
+    def test_infile_outfile(self):
+        infile = self._create_infile()
+        outfile = support.TESTFN + '.out'
+        rc, out, err = assert_python_ok('-m', 'json.tool', infile, outfile)
+        self.addCleanup(os.remove, outfile)
+        with open(outfile, "r") as fp:
+            self.assertEqual(fp.read(), self.expect)
+        self.assertEqual(out, b'')
+        self.assertEqual(err, b'')
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -892,6 +892,7 @@
 William Park
 Harri Pasanen
 Ga?l Pasgrimaud
+Berker Peksag
 Bo Peng
 Joe Peterson
 Randy Pausch
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,6 +140,9 @@
 Library
 -------
 
+- Issue #16549: Make json.tool work again on Python 3 and add tests.
+  Initial patch by Berker Peksag and Serhiy Storchaka.
+
 - Issue #12848: The pure Python pickle implementation now treats object
   lengths as unsigned 32-bit integers, like the C implementation does.
   Patch by Serhiy Storchaka.

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

From python-checkins at python.org  Thu Nov 29 01:27:53 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:53 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NDc2OiBGaXgg?=
 =?utf-8?q?json=2Etool_to_avoid_including_trailing_whitespace=2E?=
Message-ID: <3YBfhT6BHHzRT3@mail.python.org>

http://hg.python.org/cpython/rev/fa277ab588de
changeset:   80639:fa277ab588de
branch:      2.7
parent:      80635:08e5973fdc7e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:22:49 2012 +0200
summary:
  #16476: Fix json.tool to avoid including trailing whitespace.

files:
  Lib/json/tests/test_tool.py |  16 ++++++++--------
  Lib/json/tool.py            |   3 ++-
  Misc/NEWS                   |   2 ++
  3 files changed, 12 insertions(+), 9 deletions(-)


diff --git a/Lib/json/tests/test_tool.py b/Lib/json/tests/test_tool.py
--- a/Lib/json/tests/test_tool.py
+++ b/Lib/json/tests/test_tool.py
@@ -19,19 +19,19 @@
     [
         [
             "blorpie"
-        ], 
+        ],
         [
             "whoops"
-        ], 
-        [], 
-        "d-shtaeou", 
-        "d-nthiouh", 
-        "i-vhbjkhnth", 
+        ],
+        [],
+        "d-shtaeou",
+        "d-nthiouh",
+        "i-vhbjkhnth",
         {
             "nifty": 87
-        }, 
+        },
         {
-            "field": "yes", 
+            "field": "yes",
             "morefield": false
         }
     ]
diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -31,7 +31,8 @@
         except ValueError, e:
             raise SystemExit(e)
     with outfile:
-        json.dump(obj, outfile, sort_keys=True, indent=4)
+        json.dump(obj, outfile, sort_keys=True,
+                  indent=4, separators=(',', ': '))
         outfile.write('\n')
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -154,6 +154,8 @@
 Library
 -------
 
+- Issue #16476: Fix json.tool to avoid including trailing whitespace.
+
 - Issue #1160: Fix compiling large regular expressions on UCS2 builds.
   Patch by Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov 29 01:27:55 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:55 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NDc2OiBGaXgg?=
 =?utf-8?q?json=2Etool_to_avoid_including_trailing_whitespace=2E?=
Message-ID: <3YBfhW1TRDzRR0@mail.python.org>

http://hg.python.org/cpython/rev/6996a53f13ce
changeset:   80640:6996a53f13ce
branch:      3.2
parent:      80636:44c544809e6c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:25:03 2012 +0200
summary:
  #16476: Fix json.tool to avoid including trailing whitespace.

files:
  Lib/json/tool.py                 |   3 ++-
  Lib/test/json_tests/test_tool.py |  16 ++++++++--------
  Misc/NEWS                        |   2 ++
  3 files changed, 12 insertions(+), 9 deletions(-)


diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -31,7 +31,8 @@
         except ValueError as e:
             raise SystemExit(e)
     with outfile:
-        json.dump(obj, outfile, sort_keys=True, indent=4)
+        json.dump(obj, outfile, sort_keys=True,
+                  indent=4, separators=(',', ': '))
         outfile.write('\n')
 
 
diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
--- a/Lib/test/json_tests/test_tool.py
+++ b/Lib/test/json_tests/test_tool.py
@@ -19,19 +19,19 @@
     [
         [
             "blorpie"
-        ], 
+        ],
         [
             "whoops"
-        ], 
-        [], 
-        "d-shtaeou", 
-        "d-nthiouh", 
-        "i-vhbjkhnth", 
+        ],
+        [],
+        "d-shtaeou",
+        "d-nthiouh",
+        "i-vhbjkhnth",
         {
             "nifty": 87
-        }, 
+        },
         {
-            "field": "yes", 
+            "field": "yes",
             "morefield": false
         }
     ]
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,8 @@
 Library
 -------
 
+- Issue #16476: Fix json.tool to avoid including trailing whitespace.
+
 - Issue #16549: Make json.tool work again on Python 3 and add tests.
   Initial patch by Berker Peksag and Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov 29 01:27:56 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316476=3A_merge_with_3=2E2=2E?=
Message-ID: <3YBfhX3nGqzRT8@mail.python.org>

http://hg.python.org/cpython/rev/73a7e6ecd0e1
changeset:   80641:73a7e6ecd0e1
branch:      3.3
parent:      80637:1e2ae5e01963
parent:      80640:6996a53f13ce
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:26:15 2012 +0200
summary:
  #16476: merge with 3.2.

files:
  Lib/json/tool.py                 |   3 ++-
  Lib/test/json_tests/test_tool.py |  16 ++++++++--------
  Misc/NEWS                        |   2 ++
  3 files changed, 12 insertions(+), 9 deletions(-)


diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -31,7 +31,8 @@
         except ValueError as e:
             raise SystemExit(e)
     with outfile:
-        json.dump(obj, outfile, sort_keys=True, indent=4)
+        json.dump(obj, outfile, sort_keys=True,
+                  indent=4, separators=(',', ': '))
         outfile.write('\n')
 
 
diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
--- a/Lib/test/json_tests/test_tool.py
+++ b/Lib/test/json_tests/test_tool.py
@@ -19,19 +19,19 @@
     [
         [
             "blorpie"
-        ], 
+        ],
         [
             "whoops"
-        ], 
-        [], 
-        "d-shtaeou", 
-        "d-nthiouh", 
-        "i-vhbjkhnth", 
+        ],
+        [],
+        "d-shtaeou",
+        "d-nthiouh",
+        "i-vhbjkhnth",
         {
             "nifty": 87
-        }, 
+        },
         {
-            "field": "yes", 
+            "field": "yes",
             "morefield": false
         }
     ]
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,8 @@
 Library
 -------
 
+- Issue #16476: Fix json.tool to avoid including trailing whitespace.
+
 - Issue #16549: Make json.tool work again on Python 3 and add tests.
   Initial patch by Berker Peksag and Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov 29 01:27:57 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:27:57 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_=2316476=3A_null_merge_with_3=2E3=2E?=
Message-ID: <3YBfhY60f2zRSr@mail.python.org>

http://hg.python.org/cpython/rev/c062ef6e4c3e
changeset:   80642:c062ef6e4c3e
parent:      80638:cdeca27b32e5
parent:      80641:73a7e6ecd0e1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:27:26 2012 +0200
summary:
  #16476: null merge with 3.3.

files:



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

From python-checkins at python.org  Thu Nov 29 01:33:39 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 01:33:39 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2316333=3A_add_Misc/NEWS_?=
	=?utf-8?q?entry_for_e63ac05ccfa8=2E?=
Message-ID: <3YBfq74lPSzRPj@mail.python.org>

http://hg.python.org/cpython/rev/1e3b01c52aee
changeset:   80643:1e3b01c52aee
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 02:33:21 2012 +0200
summary:
  #16333: add Misc/NEWS entry for e63ac05ccfa8.

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
@@ -140,6 +140,9 @@
 Library
 -------
 
+- Issue #16333: use (",", ": ") as default separator when indent is specified
+  to avoid trailing whitespace.  Patch by Serhiy Storchaka.
+
 - Issue #16549: Make json.tool work again on Python 3 and add tests.
   Initial patch by Berker Peksag and Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov 29 03:13:05 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Thu, 29 Nov 2012 03:13:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_additional_links_rega?=
	=?utf-8?q?rding_the_PEP_process=2E?=
Message-ID: <3YBj1s2FkLzRPN@mail.python.org>

http://hg.python.org/devguide/rev/70fb48c58536
changeset:   575:70fb48c58536
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 18:12:06 2012 -0800
summary:
  Add additional links regarding the PEP process.

files:
  faq.rst         |   6 ++++++
  langchanges.rst |  15 ++++++++++-----
  2 files changed, 16 insertions(+), 5 deletions(-)


diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -25,6 +25,10 @@
 .. _StackOverflow: http://stackoverflow.com/
 .. _Freenode: http://freenode.net/
 
+
+.. index::
+   single: PEP process; in FAQ
+
 .. _suggesting-changes:
 
 Where should I suggest new features and language changes?
@@ -48,6 +52,8 @@
 For some examples on language changes that were accepted please read
 `Justifying Python Language Changes`_.
 
+See also the :ref:`langchanges` section of this guide.
+
 .. _python-ideas: http://mail.python.org/mailman/listinfo/python-ideas
 .. _issue tracker: http://bugs.python.org
 .. _PEP Index: http://www.python.org/dev/peps
diff --git a/langchanges.rst b/langchanges.rst
--- a/langchanges.rst
+++ b/langchanges.rst
@@ -25,7 +25,7 @@
 is to ask on :ref:`python-list or python-ideas <communication>`. You can also
 go through Python's stdlib and find examples of code which would benefit from
 your proposed change (which helps communicate the usefulness of your change to
-others).
+others). For further guidance, see :ref:`suggesting-changes` in the FAQ.
 
 Your proposed change also needs to be *Pythonic*. While Guido is the only
 person who can truly classify something as Pythonic, you can read the `Zen of
@@ -34,11 +34,14 @@
 .. _Zen of Python: http://www.python.org/dev/peps/pep-0020/
 
 
-Process
--------
+.. index:: PEP process
+
+PEP Process
+-----------
 Once you are certain you have a language change proposal which will appeal to
-the general Python community, you can being the process of officially proposing
-the change.
+the general Python community, you can begin the process of officially proposing
+the change. This process is the Python Enhancement Proposal (PEP) process.
+`PEP 1`_ describes it in detail.
 
 You will first need a PEP that you will present to python-ideas. You may be a
 little hazy on the technical details as various core developers can help with
@@ -58,3 +61,5 @@
 language change will be introduced in the next release of Python. Otherwise
 your PEP will be recorded as rejected along with an explanation as to why so
 that others do not propose the same language change in the future.
+
+.. _PEP 1: http://www.python.org/dev/peps/pep-0001/

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

From python-checkins at python.org  Thu Nov 29 04:00:49 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Thu, 29 Nov 2012 04:00:49 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Use_PEP_role_for_PEP_link?=
	=?utf-8?q?=2E?=
Message-ID: <3YBk4x2HGJzRQF@mail.python.org>

http://hg.python.org/devguide/rev/a0bfb97184e3
changeset:   576:a0bfb97184e3
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 28 18:36:49 2012 -0800
summary:
  Use PEP role for PEP link.

files:
  langchanges.rst |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/langchanges.rst b/langchanges.rst
--- a/langchanges.rst
+++ b/langchanges.rst
@@ -41,7 +41,7 @@
 Once you are certain you have a language change proposal which will appeal to
 the general Python community, you can begin the process of officially proposing
 the change. This process is the Python Enhancement Proposal (PEP) process.
-`PEP 1`_ describes it in detail.
+:PEP:`1` describes it in detail.
 
 You will first need a PEP that you will present to python-ideas. You may be a
 little hazy on the technical details as various core developers can help with
@@ -61,5 +61,3 @@
 language change will be introduced in the next release of Python. Otherwise
 your PEP will be recorded as rejected along with an explanation as to why so
 that others do not propose the same language change in the future.
-
-.. _PEP 1: http://www.python.org/dev/peps/pep-0001/

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

From python-checkins at python.org  Thu Nov 29 04:10:59 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 04:10:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2NTQ5OiBmaXgg?=
 =?utf-8?q?test_failures_on_Windows=2E?=
Message-ID: <3YBkJg0qrlzRP4@mail.python.org>

http://hg.python.org/cpython/rev/4102c1a02417
changeset:   80644:4102c1a02417
branch:      2.7
parent:      80639:fa277ab588de
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 05:08:54 2012 +0200
summary:
  #16549: fix test failures on Windows.

files:
  Lib/json/tests/test_tool.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/json/tests/test_tool.py b/Lib/json/tests/test_tool.py
--- a/Lib/json/tests/test_tool.py
+++ b/Lib/json/tests/test_tool.py
@@ -42,7 +42,7 @@
                 (sys.executable, '-m', 'json.tool'),
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         out, err = proc.communicate(self.data.encode())
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, None)
 
     def _create_infile(self):
@@ -55,7 +55,7 @@
     def test_infile_stdout(self):
         infile = self._create_infile()
         rc, out, err = assert_python_ok('-m', 'json.tool', infile)
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, b'')
 
     def test_infile_outfile(self):

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

From python-checkins at python.org  Thu Nov 29 04:11:00 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 04:11:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2NTQ5OiBmaXgg?=
 =?utf-8?q?test_failures_on_Windows=2E?=
Message-ID: <3YBkJh3RdhzRS8@mail.python.org>

http://hg.python.org/cpython/rev/4ec9f0b0f8f1
changeset:   80645:4ec9f0b0f8f1
branch:      3.2
parent:      80640:6996a53f13ce
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 05:10:07 2012 +0200
summary:
  #16549: fix test failures on Windows.

files:
  Lib/test/json_tests/test_tool.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
--- a/Lib/test/json_tests/test_tool.py
+++ b/Lib/test/json_tests/test_tool.py
@@ -42,7 +42,7 @@
                 (sys.executable, '-m', 'json.tool'),
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
             out, err = proc.communicate(self.data.encode())
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, None)
 
     def _create_infile(self):
@@ -55,7 +55,7 @@
     def test_infile_stdout(self):
         infile = self._create_infile()
         rc, out, err = assert_python_ok('-m', 'json.tool', infile)
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, b'')
 
     def test_infile_outfile(self):

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

From python-checkins at python.org  Thu Nov 29 04:11:01 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 04:11:01 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2316549=3A_merge_with_3=2E2=2E?=
Message-ID: <3YBkJj5b5fzRRK@mail.python.org>

http://hg.python.org/cpython/rev/e26345437f9f
changeset:   80646:e26345437f9f
branch:      3.3
parent:      80641:73a7e6ecd0e1
parent:      80645:4ec9f0b0f8f1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 05:10:31 2012 +0200
summary:
  #16549: merge with 3.2.

files:
  Lib/test/json_tests/test_tool.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
--- a/Lib/test/json_tests/test_tool.py
+++ b/Lib/test/json_tests/test_tool.py
@@ -42,7 +42,7 @@
                 (sys.executable, '-m', 'json.tool'),
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
             out, err = proc.communicate(self.data.encode())
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, None)
 
     def _create_infile(self):
@@ -55,7 +55,7 @@
     def test_infile_stdout(self):
         infile = self._create_infile()
         rc, out, err = assert_python_ok('-m', 'json.tool', infile)
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, b'')
 
     def test_infile_outfile(self):

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

From python-checkins at python.org  Thu Nov 29 04:11:03 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 29 Nov 2012 04:11:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE2NTQ5OiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3YBkJl0jJPzRR0@mail.python.org>

http://hg.python.org/cpython/rev/2a73d9e64d34
changeset:   80647:2a73d9e64d34
parent:      80643:1e3b01c52aee
parent:      80646:e26345437f9f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Nov 29 05:10:45 2012 +0200
summary:
  #16549: merge with 3.3.

files:
  Lib/test/json_tests/test_tool.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
--- a/Lib/test/json_tests/test_tool.py
+++ b/Lib/test/json_tests/test_tool.py
@@ -42,7 +42,7 @@
                 (sys.executable, '-m', 'json.tool'),
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
             out, err = proc.communicate(self.data.encode())
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, None)
 
     def _create_infile(self):
@@ -55,7 +55,7 @@
     def test_infile_stdout(self):
         infile = self._create_infile()
         rc, out, err = assert_python_ok('-m', 'json.tool', infile)
-        self.assertEqual(out, self.expect.encode())
+        self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
         self.assertEqual(err, b'')
 
     def test_infile_outfile(self):

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

From solipsis at pitrou.net  Thu Nov 29 05:56:57 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 29 Nov 2012 05:56:57 +0100
Subject: [Python-checkins] Daily reference leaks (1e3b01c52aee): sum=0
Message-ID: <E1TdwBF-0007FA-1F@ap.vmr.nerim.net>

results for 1e3b01c52aee on branch "default"
--------------------------------------------



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

From python-checkins at python.org  Thu Nov 29 13:22:43 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 13:22:43 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2NDc3?=
 =?utf-8?q?=3A_Close_tarfile_internal_handlers_in_case_of_exception=2E?=
Message-ID: <3YByYH1mGlzQRM@mail.python.org>

http://hg.python.org/cpython/rev/b7bdc0b3c2fe
changeset:   80648:b7bdc0b3c2fe
branch:      3.2
parent:      80645:4ec9f0b0f8f1
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 14:20:47 2012 +0200
summary:
  Issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

files:
  Lib/tarfile.py |  24 +++++++++++-------------
  1 files changed, 11 insertions(+), 13 deletions(-)


diff --git a/Lib/tarfile.py b/Lib/tarfile.py
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -2077,9 +2077,8 @@
 
         # Append the tar header and data to the archive.
         if tarinfo.isreg():
-            f = bltn_open(name, "rb")
-            self.addfile(tarinfo, f)
-            f.close()
+            with bltn_open(name, "rb") as f:
+                self.addfile(tarinfo, f)
 
         elif tarinfo.isdir():
             self.addfile(tarinfo)
@@ -2292,16 +2291,15 @@
         """
         source = self.fileobj
         source.seek(tarinfo.offset_data)
-        target = bltn_open(targetpath, "wb")
-        if tarinfo.sparse is not None:
-            for offset, size in tarinfo.sparse:
-                target.seek(offset)
-                copyfileobj(source, target, size)
-        else:
-            copyfileobj(source, target, tarinfo.size)
-        target.seek(tarinfo.size)
-        target.truncate()
-        target.close()
+        with bltn_open(targetpath, "wb") as target:
+            if tarinfo.sparse is not None:
+                for offset, size in tarinfo.sparse:
+                    target.seek(offset)
+                    copyfileobj(source, target, size)
+            else:
+                copyfileobj(source, target, tarinfo.size)
+            target.seek(tarinfo.size)
+            target.truncate()
 
     def makeunknown(self, tarinfo, targetpath):
         """Make a file from a TarInfo object with an unknown type

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

From python-checkins at python.org  Thu Nov 29 13:22:44 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 13:22:44 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_issue_=2316477=3A_Close_tarfile_internal_handlers_in_cas?=
 =?utf-8?q?e_of_exception=2E?=
Message-ID: <3YByYJ4CKCzRMZ@mail.python.org>

http://hg.python.org/cpython/rev/80749ddc30b6
changeset:   80649:80749ddc30b6
branch:      3.3
parent:      80646:e26345437f9f
parent:      80648:b7bdc0b3c2fe
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 14:21:23 2012 +0200
summary:
  Merge issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

files:
  Lib/tarfile.py |  24 +++++++++++-------------
  1 files changed, 11 insertions(+), 13 deletions(-)


diff --git a/Lib/tarfile.py b/Lib/tarfile.py
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1924,9 +1924,8 @@
 
         # Append the tar header and data to the archive.
         if tarinfo.isreg():
-            f = bltn_open(name, "rb")
-            self.addfile(tarinfo, f)
-            f.close()
+            with bltn_open(name, "rb") as f:
+                self.addfile(tarinfo, f)
 
         elif tarinfo.isdir():
             self.addfile(tarinfo)
@@ -2131,16 +2130,15 @@
         """
         source = self.fileobj
         source.seek(tarinfo.offset_data)
-        target = bltn_open(targetpath, "wb")
-        if tarinfo.sparse is not None:
-            for offset, size in tarinfo.sparse:
-                target.seek(offset)
-                copyfileobj(source, target, size)
-        else:
-            copyfileobj(source, target, tarinfo.size)
-        target.seek(tarinfo.size)
-        target.truncate()
-        target.close()
+        with bltn_open(targetpath, "wb") as target:
+            if tarinfo.sparse is not None:
+                for offset, size in tarinfo.sparse:
+                    target.seek(offset)
+                    copyfileobj(source, target, size)
+            else:
+                copyfileobj(source, target, tarinfo.size)
+            target.seek(tarinfo.size)
+            target.truncate()
 
     def makeunknown(self, tarinfo, targetpath):
         """Make a file from a TarInfo object with an unknown type

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

From python-checkins at python.org  Thu Nov 29 13:22:45 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 13:22:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_issue_=2316477=3A_Close_tarfile_internal_handlers_?=
 =?utf-8?q?in_case_of_exception=2E?=
Message-ID: <3YByYK6m83zRPR@mail.python.org>

http://hg.python.org/cpython/rev/2d887691a99b
changeset:   80650:2d887691a99b
parent:      80647:2a73d9e64d34
parent:      80649:80749ddc30b6
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 14:21:39 2012 +0200
summary:
  Merge issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

files:
  Lib/tarfile.py |  24 +++++++++++-------------
  1 files changed, 11 insertions(+), 13 deletions(-)


diff --git a/Lib/tarfile.py b/Lib/tarfile.py
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1924,9 +1924,8 @@
 
         # Append the tar header and data to the archive.
         if tarinfo.isreg():
-            f = bltn_open(name, "rb")
-            self.addfile(tarinfo, f)
-            f.close()
+            with bltn_open(name, "rb") as f:
+                self.addfile(tarinfo, f)
 
         elif tarinfo.isdir():
             self.addfile(tarinfo)
@@ -2131,16 +2130,15 @@
         """
         source = self.fileobj
         source.seek(tarinfo.offset_data)
-        target = bltn_open(targetpath, "wb")
-        if tarinfo.sparse is not None:
-            for offset, size in tarinfo.sparse:
-                target.seek(offset)
-                copyfileobj(source, target, size)
-        else:
-            copyfileobj(source, target, tarinfo.size)
-        target.seek(tarinfo.size)
-        target.truncate()
-        target.close()
+        with bltn_open(targetpath, "wb") as target:
+            if tarinfo.sparse is not None:
+                for offset, size in tarinfo.sparse:
+                    target.seek(offset)
+                    copyfileobj(source, target, size)
+            else:
+                copyfileobj(source, target, tarinfo.size)
+            target.seek(tarinfo.size)
+            target.truncate()
 
     def makeunknown(self, tarinfo, targetpath):
         """Make a file from a TarInfo object with an unknown type

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

From python-checkins at python.org  Thu Nov 29 13:22:47 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 13:22:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2NDc3?=
 =?utf-8?q?=3A_Close_tarfile_internal_handlers_in_case_of_exception=2E?=
Message-ID: <3YByYM1wpzzRQT@mail.python.org>

http://hg.python.org/cpython/rev/ea4bdf5a2e69
changeset:   80651:ea4bdf5a2e69
branch:      2.7
parent:      80644:4102c1a02417
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 14:22:26 2012 +0200
summary:
  Issue #16477: Close tarfile internal handlers in case of exception.

Patch by Serhiy Storchaka.

files:
  Lib/tarfile.py |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Lib/tarfile.py b/Lib/tarfile.py
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1987,9 +1987,8 @@
 
         # Append the tar header and data to the archive.
         if tarinfo.isreg():
-            f = bltn_open(name, "rb")
-            self.addfile(tarinfo, f)
-            f.close()
+            with bltn_open(name, "rb") as f:
+                self.addfile(tarinfo, f)
 
         elif tarinfo.isdir():
             self.addfile(tarinfo)
@@ -2197,10 +2196,11 @@
         """Make a file called targetpath.
         """
         source = self.extractfile(tarinfo)
-        target = bltn_open(targetpath, "wb")
-        copyfileobj(source, target)
-        source.close()
-        target.close()
+        try:
+            with bltn_open(targetpath, "wb") as target:
+                copyfileobj(source, target)
+        finally:
+            source.close()
 
     def makeunknown(self, tarinfo, targetpath):
         """Make a file from a TarInfo object with an unknown type

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

From python-checkins at python.org  Thu Nov 29 14:23:56 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 14:23:56 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Remove_redunda?=
 =?utf-8?q?nt_sentence_from_c-api_docs_=28issue_=2316323=29?=
Message-ID: <3YBzvw535tzQcQ@mail.python.org>

http://hg.python.org/cpython/rev/af45e9ec35f0
changeset:   80652:af45e9ec35f0
branch:      3.3
parent:      80649:80749ddc30b6
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 15:23:15 2012 +0200
summary:
  Remove redundant sentence from c-api docs (issue #16323)

files:
  Doc/c-api/unicode.rst |  5 +----
  1 files changed, 1 insertions(+), 4 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -742,10 +742,7 @@
    Decode a string from the current locale encoding. The supported
    error handlers are ``"strict"`` and ``"surrogateescape"``
    (:pep:`383`). The decoder uses ``"strict"`` error handler if
-   *errors* is ``NULL``. If a byte sequence can be decoded as a
-   surrogate character and *errors* is not ``"strict"``, then the byte
-   sequence is escaped using the ``"surrogateescape"`` error handler
-   instead of being decoded. *str* must end with a null character but
+   *errors* is ``NULL``.  *str* must end with a null character but
    cannot contain embedded null characters.
 
    .. seealso::

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

From python-checkins at python.org  Thu Nov 29 14:23:58 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 14:23:58 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_remove_redundant_sentence_from_c-api_docs_=28is?=
 =?utf-8?q?sue_=2316323=29?=
Message-ID: <3YBzvy0FXnzNW1@mail.python.org>

http://hg.python.org/cpython/rev/efedd0f62a7e
changeset:   80653:efedd0f62a7e
parent:      80650:2d887691a99b
parent:      80652:af45e9ec35f0
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 15:23:46 2012 +0200
summary:
  Merge: remove redundant sentence from c-api docs (issue #16323)

files:
  Doc/c-api/unicode.rst |  5 +----
  1 files changed, 1 insertions(+), 4 deletions(-)


diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -742,10 +742,7 @@
    Decode a string from the current locale encoding. The supported
    error handlers are ``"strict"`` and ``"surrogateescape"``
    (:pep:`383`). The decoder uses ``"strict"`` error handler if
-   *errors* is ``NULL``. If a byte sequence can be decoded as a
-   surrogate character and *errors* is not ``"strict"``, then the byte
-   sequence is escaped using the ``"surrogateescape"`` error handler
-   instead of being decoded. *str* must end with a null character but
+   *errors* is ``NULL``.  *str* must end with a null character but
    cannot contain embedded null characters.
 
    .. seealso::

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

From python-checkins at python.org  Thu Nov 29 16:58:59 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:58:59 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_enumerate_only?=
 =?utf-8?q?_requires_an_iterable_=28closes_=2316573=29?=
Message-ID: <3YC3Lq4Pl3zQgq@mail.python.org>

http://hg.python.org/cpython/rev/3c6d8461b09f
changeset:   80654:3c6d8461b09f
branch:      3.2
parent:      80648:b7bdc0b3c2fe
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:55:22 2012 -0500
summary:
  enumerate only requires an iterable (closes #16573)

Patch by Jonathan Kotta.

files:
  Lib/lib2to3/fixer_util.py        |  12 ++++++------
  Lib/lib2to3/tests/test_fixers.py |  12 ++++++++++++
  2 files changed, 18 insertions(+), 6 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
@@ -165,7 +165,7 @@
 
 
 consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum",
-                       "min", "max"])
+                       "min", "max", "enumerate"])
 
 def attr_chain(obj, attr):
     """Follow an attribute chain.
@@ -192,14 +192,14 @@
 p1 = """
 power<
     ( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' |
-      'any' | 'all' | (any* trailer< '.' 'join' >) )
+      'any' | 'all' | 'enumerate' | (any* trailer< '.' 'join' >) )
     trailer< '(' node=any ')' >
     any*
 >
 """
 p2 = """
 power<
-    'sorted'
+    ( 'sorted' | 'enumerate' )
     trailer< '(' arglist<node=any any*> ')' >
     any*
 >
@@ -207,14 +207,14 @@
 pats_built = False
 def in_special_context(node):
     """ Returns true if node is in an environment where all that is required
-        of it is being itterable (ie, it doesn't matter if it returns a list
-        or an itterator).
+        of it is being iterable (ie, it doesn't matter if it returns a list
+        or an iterator).
         See test_map_nochange in test_fixers.py for some examples and tests.
         """
     global p0, p1, p2, pats_built
     if not pats_built:
+        p0 = patcomp.compile_pattern(p0)
         p1 = patcomp.compile_pattern(p1)
-        p0 = patcomp.compile_pattern(p0)
         p2 = patcomp.compile_pattern(p2)
         pats_built = True
     patterns = [p0, p1, p2]
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -2981,6 +2981,10 @@
         self.unchanged(a)
         a = """sorted(filter(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in filter(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in filter(f, 'abc')]"""
@@ -3089,6 +3093,10 @@
         self.unchanged(a)
         a = """sorted(map(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(map(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(map(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in map(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in map(f, 'abc')]"""
@@ -3152,6 +3160,10 @@
         self.unchanged(a)
         a = """sorted(zip(a, b), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(zip(a, b))"""
+        self.unchanged(a)
+        a = """enumerate(zip(a, b), start=1)"""
+        self.unchanged(a)
         a = """for i in zip(a, b): pass"""
         self.unchanged(a)
         a = """[x for x in zip(a, b)]"""

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

From python-checkins at python.org  Thu Nov 29 16:59:00 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:59:00 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_merge_3=2E2_=28=2316573=29?=
Message-ID: <3YC3Lr74VQzRPw@mail.python.org>

http://hg.python.org/cpython/rev/4ff17cf130eb
changeset:   80655:4ff17cf130eb
branch:      3.3
parent:      80652:af45e9ec35f0
parent:      80654:3c6d8461b09f
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:56:11 2012 -0500
summary:
  merge 3.2 (#16573)

files:
  Lib/lib2to3/fixer_util.py        |  12 ++++++------
  Lib/lib2to3/tests/test_fixers.py |  12 ++++++++++++
  2 files changed, 18 insertions(+), 6 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
@@ -165,7 +165,7 @@
 
 
 consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum",
-                       "min", "max"])
+                       "min", "max", "enumerate"])
 
 def attr_chain(obj, attr):
     """Follow an attribute chain.
@@ -192,14 +192,14 @@
 p1 = """
 power<
     ( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' |
-      'any' | 'all' | (any* trailer< '.' 'join' >) )
+      'any' | 'all' | 'enumerate' | (any* trailer< '.' 'join' >) )
     trailer< '(' node=any ')' >
     any*
 >
 """
 p2 = """
 power<
-    'sorted'
+    ( 'sorted' | 'enumerate' )
     trailer< '(' arglist<node=any any*> ')' >
     any*
 >
@@ -207,14 +207,14 @@
 pats_built = False
 def in_special_context(node):
     """ Returns true if node is in an environment where all that is required
-        of it is being itterable (ie, it doesn't matter if it returns a list
-        or an itterator).
+        of it is being iterable (ie, it doesn't matter if it returns a list
+        or an iterator).
         See test_map_nochange in test_fixers.py for some examples and tests.
         """
     global p0, p1, p2, pats_built
     if not pats_built:
+        p0 = patcomp.compile_pattern(p0)
         p1 = patcomp.compile_pattern(p1)
-        p0 = patcomp.compile_pattern(p0)
         p2 = patcomp.compile_pattern(p2)
         pats_built = True
     patterns = [p0, p1, p2]
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -2981,6 +2981,10 @@
         self.unchanged(a)
         a = """sorted(filter(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in filter(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in filter(f, 'abc')]"""
@@ -3089,6 +3093,10 @@
         self.unchanged(a)
         a = """sorted(map(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(map(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(map(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in map(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in map(f, 'abc')]"""
@@ -3152,6 +3160,10 @@
         self.unchanged(a)
         a = """sorted(zip(a, b), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(zip(a, b))"""
+        self.unchanged(a)
+        a = """enumerate(zip(a, b), start=1)"""
+        self.unchanged(a)
         a = """for i in zip(a, b): pass"""
         self.unchanged(a)
         a = """[x for x in zip(a, b)]"""

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

From python-checkins at python.org  Thu Nov 29 16:59:02 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:59:02 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_enumerate_only?=
 =?utf-8?q?_requires_an_iterable_=28closes_=2316573=29?=
Message-ID: <3YC3Lt2TNXzRSG@mail.python.org>

http://hg.python.org/cpython/rev/2bb604a691de
changeset:   80656:2bb604a691de
branch:      2.7
parent:      80651:ea4bdf5a2e69
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:55:22 2012 -0500
summary:
  enumerate only requires an iterable (closes #16573)

Patch by Jonathan Kotta.

files:
  Lib/lib2to3/fixer_util.py        |  12 ++++++------
  Lib/lib2to3/tests/test_fixers.py |  12 ++++++++++++
  2 files changed, 18 insertions(+), 6 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
@@ -165,7 +165,7 @@
 
 
 consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum",
-                       "min", "max"])
+                       "min", "max", "enumerate"])
 
 def attr_chain(obj, attr):
     """Follow an attribute chain.
@@ -192,14 +192,14 @@
 p1 = """
 power<
     ( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' |
-      'any' | 'all' | (any* trailer< '.' 'join' >) )
+      'any' | 'all' | 'enumerate' | (any* trailer< '.' 'join' >) )
     trailer< '(' node=any ')' >
     any*
 >
 """
 p2 = """
 power<
-    'sorted'
+    ( 'sorted' | 'enumerate' )
     trailer< '(' arglist<node=any any*> ')' >
     any*
 >
@@ -207,14 +207,14 @@
 pats_built = False
 def in_special_context(node):
     """ Returns true if node is in an environment where all that is required
-        of it is being itterable (ie, it doesn't matter if it returns a list
-        or an itterator).
+        of it is being iterable (ie, it doesn't matter if it returns a list
+        or an iterator).
         See test_map_nochange in test_fixers.py for some examples and tests.
         """
     global p0, p1, p2, pats_built
     if not pats_built:
+        p0 = patcomp.compile_pattern(p0)
         p1 = patcomp.compile_pattern(p1)
-        p0 = patcomp.compile_pattern(p0)
         p2 = patcomp.compile_pattern(p2)
         pats_built = True
     patterns = [p0, p1, p2]
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -2981,6 +2981,10 @@
         self.unchanged(a)
         a = """sorted(filter(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in filter(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in filter(f, 'abc')]"""
@@ -3089,6 +3093,10 @@
         self.unchanged(a)
         a = """sorted(map(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(map(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(map(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in map(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in map(f, 'abc')]"""
@@ -3152,6 +3160,10 @@
         self.unchanged(a)
         a = """sorted(zip(a, b), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(zip(a, b))"""
+        self.unchanged(a)
+        a = """enumerate(zip(a, b), start=1)"""
+        self.unchanged(a)
         a = """for i in zip(a, b): pass"""
         self.unchanged(a)
         a = """[x for x in zip(a, b)]"""

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

From python-checkins at python.org  Thu Nov 29 16:59:03 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:59:03 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_add_changelog?=
Message-ID: <3YC3Lv4mxgzRRQ@mail.python.org>

http://hg.python.org/cpython/rev/a35ee2d6a4ad
changeset:   80657:a35ee2d6a4ad
branch:      3.2
parent:      80654:3c6d8461b09f
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:57:01 2012 -0500
summary:
  add changelog

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,10 @@
 Library
 -------
 
+- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous
+  list() calls aren't added to filter(), map(), and zip() which are directly
+  passed enumerate().
+
 - Issue #16476: Fix json.tool to avoid including trailing whitespace.
 
 - Issue #16549: Make json.tool work again on Python 3 and add tests.

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

From python-checkins at python.org  Thu Nov 29 16:59:05 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:59:05 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
	=?utf-8?q?_merge_3=2E2?=
Message-ID: <3YC3Lx0JD1zRKX@mail.python.org>

http://hg.python.org/cpython/rev/cff7995ca7e8
changeset:   80658:cff7995ca7e8
branch:      3.3
parent:      80655:4ff17cf130eb
parent:      80657:a35ee2d6a4ad
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:57:11 2012 -0500
summary:
  merge 3.2

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,10 @@
 Library
 -------
 
+- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous
+  list() calls aren't added to filter(), map(), and zip() which are directly
+  passed enumerate().
+
 - Issue #16476: Fix json.tool to avoid including trailing whitespace.
 
 - Issue #16549: Make json.tool work again on Python 3 and add tests.

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

From python-checkins at python.org  Thu Nov 29 16:59:06 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:59:06 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_add_changelog?=
Message-ID: <3YC3Ly2mYSzRMM@mail.python.org>

http://hg.python.org/cpython/rev/c704130f9221
changeset:   80659:c704130f9221
branch:      2.7
parent:      80656:2bb604a691de
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:57:01 2012 -0500
summary:
  add changelog

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -154,6 +154,10 @@
 Library
 -------
 
+- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous
+  list() calls aren't added to filter(), map(), and zip() which are directly
+  passed enumerate().
+
 - Issue #16476: Fix json.tool to avoid including trailing whitespace.
 
 - Issue #1160: Fix compiling large regular expressions on UCS2 builds.

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

From python-checkins at python.org  Thu Nov 29 16:59:07 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Thu, 29 Nov 2012 16:59:07 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogbWVyZ2UgMy4zICgjMTY1NzMp?=
Message-ID: <3YC3Lz6KFzzRRc@mail.python.org>

http://hg.python.org/cpython/rev/ce3f0399ea33
changeset:   80660:ce3f0399ea33
parent:      80653:efedd0f62a7e
parent:      80658:cff7995ca7e8
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Nov 29 10:58:43 2012 -0500
summary:
  merge 3.3 (#16573)

files:
  Lib/lib2to3/fixer_util.py        |  12 ++++++------
  Lib/lib2to3/tests/test_fixers.py |  12 ++++++++++++
  Misc/NEWS                        |   4 ++++
  3 files changed, 22 insertions(+), 6 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
@@ -165,7 +165,7 @@
 
 
 consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum",
-                       "min", "max"])
+                       "min", "max", "enumerate"])
 
 def attr_chain(obj, attr):
     """Follow an attribute chain.
@@ -192,14 +192,14 @@
 p1 = """
 power<
     ( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' |
-      'any' | 'all' | (any* trailer< '.' 'join' >) )
+      'any' | 'all' | 'enumerate' | (any* trailer< '.' 'join' >) )
     trailer< '(' node=any ')' >
     any*
 >
 """
 p2 = """
 power<
-    'sorted'
+    ( 'sorted' | 'enumerate' )
     trailer< '(' arglist<node=any any*> ')' >
     any*
 >
@@ -207,14 +207,14 @@
 pats_built = False
 def in_special_context(node):
     """ Returns true if node is in an environment where all that is required
-        of it is being itterable (ie, it doesn't matter if it returns a list
-        or an itterator).
+        of it is being iterable (ie, it doesn't matter if it returns a list
+        or an iterator).
         See test_map_nochange in test_fixers.py for some examples and tests.
         """
     global p0, p1, p2, pats_built
     if not pats_built:
+        p0 = patcomp.compile_pattern(p0)
         p1 = patcomp.compile_pattern(p1)
-        p0 = patcomp.compile_pattern(p0)
         p2 = patcomp.compile_pattern(p2)
         pats_built = True
     patterns = [p0, p1, p2]
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -2981,6 +2981,10 @@
         self.unchanged(a)
         a = """sorted(filter(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(filter(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in filter(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in filter(f, 'abc')]"""
@@ -3089,6 +3093,10 @@
         self.unchanged(a)
         a = """sorted(map(f, 'abc'), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(map(f, 'abc'))"""
+        self.unchanged(a)
+        a = """enumerate(map(f, 'abc'), start=1)"""
+        self.unchanged(a)
         a = """for i in map(f, 'abc'): pass"""
         self.unchanged(a)
         a = """[x for x in map(f, 'abc')]"""
@@ -3152,6 +3160,10 @@
         self.unchanged(a)
         a = """sorted(zip(a, b), key=blah)[0]"""
         self.unchanged(a)
+        a = """enumerate(zip(a, b))"""
+        self.unchanged(a)
+        a = """enumerate(zip(a, b), start=1)"""
+        self.unchanged(a)
         a = """for i in zip(a, b): pass"""
         self.unchanged(a)
         a = """[x for x in zip(a, b)]"""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,10 @@
 - Issue #16333: use (",", ": ") as default separator when indent is specified
   to avoid trailing whitespace.  Patch by Serhiy Storchaka.
 
+- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous
+  list() calls aren't added to filter(), map(), and zip() which are directly
+  passed enumerate().
+
 - Issue #16549: Make json.tool work again on Python 3 and add tests.
   Initial patch by Berker Peksag and Serhiy Storchaka.
 

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

From python-checkins at python.org  Thu Nov 29 18:52:32 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 18:52:32 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MTk0?=
 =?utf-8?q?=3A_document_imp=2Eload=5Fdynamic_problems?=
Message-ID: <3YC5sr4d2jzRJd@mail.python.org>

http://hg.python.org/cpython/rev/94de77bd0b4b
changeset:   80661:94de77bd0b4b
branch:      2.7
parent:      80651:ea4bdf5a2e69
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 19:51:28 2012 +0200
summary:
  Issue #16194: document imp.load_dynamic problems
when read several extension modules from the same binary object file.

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


diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -237,6 +237,17 @@
    using shared libraries is highly system dependent, and not all systems support
    it.)
 
+   .. impl-detail::
+
+    The import internals identify extension modules by filename, so doing
+    ``foo = load_dynamic("foo", "mod.so")`` and
+    ``bar = load_dynamic("bar", "mod.so")`` will result in both foo and bar
+    referring to the same module, regardless of whether or not
+    ``mod.so`` exports an ``initbar`` function. On systems which
+    support them, symlinks can be used to import multiple modules from
+    the same shared library, as each reference to the module will use
+    a different file name.
+
 
 .. function:: load_source(name, pathname[, file])
 

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

From python-checkins at python.org  Thu Nov 29 18:52:34 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Thu, 29 Nov 2012 18:52:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
	=?utf-8?q?_merge_heads?=
Message-ID: <3YC5st08zXzRRY@mail.python.org>

http://hg.python.org/cpython/rev/40b71097d255
changeset:   80662:40b71097d255
branch:      2.7
parent:      80659:c704130f9221
parent:      80661:94de77bd0b4b
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Nov 29 19:52:21 2012 +0200
summary:
  merge heads

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


diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -237,6 +237,17 @@
    using shared libraries is highly system dependent, and not all systems support
    it.)
 
+   .. impl-detail::
+
+    The import internals identify extension modules by filename, so doing
+    ``foo = load_dynamic("foo", "mod.so")`` and
+    ``bar = load_dynamic("bar", "mod.so")`` will result in both foo and bar
+    referring to the same module, regardless of whether or not
+    ``mod.so`` exports an ``initbar`` function. On systems which
+    support them, symlinks can be used to import multiple modules from
+    the same shared library, as each reference to the module will use
+    a different file name.
+
 
 .. function:: load_source(name, pathname[, file])
 

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

From python-checkins at python.org  Fri Nov 30 04:04:34 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 30 Nov 2012 04:04:34 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Backport_from_?=
 =?utf-8?q?3=2E2=3A_improve_argument/parameter_documentation_=28issue_=231?=
 =?utf-8?b?NTk5MCku?=
Message-ID: <3YCL6p3fmzzNGR@mail.python.org>

http://hg.python.org/cpython/rev/f44b8d69e5fc
changeset:   80663:f44b8d69e5fc
branch:      2.7
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Thu Nov 29 19:03:37 2012 -0800
summary:
  Backport from 3.2: improve argument/parameter documentation (issue #15990).

The corresponding 3.x commits are 69d5d834c5cb, 40fd26a4206b, and
74d8a2a20c52.

files:
  Doc/faq/programming.rst |  21 +++++++
  Doc/glossary.rst        |  85 ++++++++++++++++++++++------
  Misc/NEWS               |   2 +
  3 files changed, 90 insertions(+), 18 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -469,6 +469,27 @@
        apply(g, (x,)+args, kwargs)
 
 
+.. _faq-argument-vs-parameter:
+
+What is the difference between arguments and parameters?
+--------------------------------------------------------
+
+:term:`Parameters <parameter>` are defined by the names that appear in a
+function definition, whereas :term:`arguments <argument>` are the values
+actually passed to a function when calling it.  Parameters define what types of
+arguments a function can accept.  For example, given the function definition::
+
+   def func(foo, bar=None, **kwargs):
+       pass
+
+*foo*, *bar* and *kwargs* are parameters of ``func``.  However, when calling
+``func``, for example::
+
+   func(42, bar=314, extra=somevar)
+
+the values ``42``, ``314``, and ``somevar`` are arguments.
+
+
 How do I write a function with output parameters (call by reference)?
 ---------------------------------------------------------------------
 
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -39,16 +39,34 @@
       create your own ABCs with the :mod:`abc` module.
 
    argument
-      A value passed to a function or method, assigned to a named local
-      variable in the function body.  A function or method may have both
-      positional arguments and keyword arguments in its definition.
-      Positional and keyword arguments may be variable-length: ``*`` accepts
-      or passes (if in the function definition or call) several positional
-      arguments in a list, while ``**`` does the same for keyword arguments
-      in a dictionary.
+      A value passed to a :term:`function` (or :term:`method`) when calling the
+      function.  There are two types of arguments:
 
-      Any expression may be used within the argument list, and the evaluated
-      value is passed to the local variable.
+      * :dfn:`keyword argument`: an argument preceded by an identifier (e.g.
+        ``name=``) in a function call or passed as a value in a dictionary
+        preceded by ``**``.  For example, ``3`` and ``5`` are both keyword
+        arguments in the following calls to :func:`complex`::
+
+           complex(real=3, imag=5)
+           complex(**{'real': 3, 'imag': 5})
+
+      * :dfn:`positional argument`: an argument that is not a keyword argument.
+        Positional arguments can appear at the beginning of an argument list
+        and/or be passed as elements of an :term:`iterable` preceded by ``*``.
+        For example, ``3`` and ``5`` are both positional arguments in the
+        following calls::
+
+           complex(3, 5)
+           complex(*(3, 5))
+
+      Arguments are assigned to the named local variables in a function body.
+      See the :ref:`calls` section for the rules governing this assignment.
+      Syntactically, any expression can be used to represent an argument; the
+      evaluated value is assigned to the local variable.
+
+      See also the :term:`parameter` glossary entry and the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`.
 
    attribute
       A value associated with an object which is referenced by name using
@@ -412,10 +430,7 @@
       <sortinghowto>` for examples of how to create and use key functions.
 
    keyword argument
-      Arguments which are preceded with a ``variable_name=`` in the call.
-      The variable name designates the local name in the function to which the
-      value is assigned.  ``**`` is used to accept or pass a dictionary of
-      keyword arguments.  See :term:`argument`.
+      See :term:`argument`.
 
    lambda
       An anonymous inline function consisting of a single :term:`expression`
@@ -537,12 +552,46 @@
       (methods).  Also the ultimate base class of any :term:`new-style
       class`.
 
+   parameter
+      A named entity in a :term:`function` (or method) definition that
+      specifies an :term:`argument` (or in some cases, arguments) that the
+      function can accept.  There are four types of parameters:
+
+      * :dfn:`positional-or-keyword`: specifies an argument that can be passed
+        either :term:`positionally <argument>` or as a :term:`keyword argument
+        <argument>`.  This is the default kind of parameter, for example *foo*
+        and *bar* in the following::
+
+           def func(foo, bar=None): ...
+
+      * :dfn:`positional-only`: specifies an argument that can be supplied only
+        by position.  Python has no syntax for defining positional-only
+        parameters.  However, some built-in functions have positional-only
+        parameters (e.g. :func:`abs`).
+
+      * :dfn:`var-positional`: specifies that an arbitrary sequence of
+        positional arguments can be provided (in addition to any positional
+        arguments already accepted by other parameters).  Such a parameter can
+        be defined by prepending the parameter name with ``*``, for example
+        *args* in the following::
+
+           def func(*args, **kwargs): ...
+
+      * :dfn:`var-keyword`: specifies that arbitrarily many keyword arguments
+        can be provided (in addition to any keyword arguments already accepted
+        by other parameters).  Such a parameter can be defined by prepending
+        the parameter name with ``**``, for example *kwargs* in the example
+        above.
+
+      Parameters can specify both optional and required arguments, as well as
+      default values for some optional arguments.
+
+      See also the :term:`argument` glossary entry, the FAQ question on
+      :ref:`the difference between arguments and parameters
+      <faq-argument-vs-parameter>`, and the :ref:`function` section.
+
    positional argument
-      The arguments assigned to local names inside a function or method,
-      determined by the order in which they were given in the call.  ``*`` is
-      used to either accept multiple positional arguments (when in the
-      definition), or pass several arguments as a list to a function.  See
-      :term:`argument`.
+      See :term:`argument`.
 
    Python 3000
       Nickname for the Python 3.x release line (coined long ago when the release
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -594,6 +594,8 @@
 Documentation
 -------------
 
+- Issue #15990: Improve argument/parameter documentation.
+
 - Issue #16400: Update the description of which versions of a given package
   PyPI displays.
 

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

From solipsis at pitrou.net  Fri Nov 30 05:59:25 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 30 Nov 2012 05:59:25 +0100
Subject: [Python-checkins] Daily reference leaks (ce3f0399ea33): sum=2
Message-ID: <E1TeIhB-0007MT-JQ@ap.vmr.nerim.net>

results for ce3f0399ea33 on branch "default"
--------------------------------------------

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


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

From python-checkins at python.org  Fri Nov 30 22:15:43 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 30 Nov 2012 22:15:43 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Remove_redunda?=
 =?utf-8?q?nt_check_for_symlink=2E_=28closes_=236036=29?=
Message-ID: <3YCpKq4fypzN9c@mail.python.org>

http://hg.python.org/cpython/rev/980b13df6ccd
changeset:   80664:980b13df6ccd
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Nov 30 16:12:15 2012 -0500
summary:
  Remove redundant check for symlink. (closes #6036)

Patch by Bruno Dupuis.

files:
  Lib/test/test_posixpath.py |  27 +++++++++++++------------
  1 files changed, 14 insertions(+), 13 deletions(-)


diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -110,8 +110,10 @@
                 ),
                 True
             )
-            # If we don't have links, assume that os.stat doesn't return resonable
-            # inode information and thus, that samefile() doesn't work
+
+            # If we don't have links, assume that os.stat doesn't return
+            # reasonable inode information and thus, that samefile() doesn't
+            # work.
             if hasattr(os, "symlink"):
                 os.symlink(
                     test_support.TESTFN + "1",
@@ -152,18 +154,17 @@
                 True
             )
             # If we don't have links, assume that os.stat() doesn't return resonable
-            # inode information and thus, that samefile() doesn't work
+            # inode information and thus, that samestat() doesn't work
             if hasattr(os, "symlink"):
-                if hasattr(os, "symlink"):
-                    os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2")
-                    self.assertIs(
-                        posixpath.samestat(
-                            os.stat(test_support.TESTFN + "1"),
-                            os.stat(test_support.TESTFN + "2")
-                        ),
-                        True
-                    )
-                    os.remove(test_support.TESTFN + "2")
+                os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2")
+                self.assertIs(
+                    posixpath.samestat(
+                        os.stat(test_support.TESTFN + "1"),
+                        os.stat(test_support.TESTFN + "2")
+                    ),
+                    True
+                )
+                os.remove(test_support.TESTFN + "2")
                 f = open(test_support.TESTFN + "2", "wb")
                 f.write("bar")
                 f.close()

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

From python-checkins at python.org  Fri Nov 30 22:15:45 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 30 Nov 2012 22:15:45 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_fix_spelling?=
Message-ID: <3YCpKs0T3KzNNg@mail.python.org>

http://hg.python.org/cpython/rev/f44372b595c8
changeset:   80665:f44372b595c8
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Nov 30 16:13:14 2012 -0500
summary:
  fix spelling

files:
  Lib/test/test_posixpath.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -153,8 +153,9 @@
                 ),
                 True
             )
-            # If we don't have links, assume that os.stat() doesn't return resonable
-            # inode information and thus, that samestat() doesn't work
+            # If we don't have links, assume that os.stat() doesn't return
+            # reasonable inode information and thus, that samestat() doesn't
+            # work.
             if hasattr(os, "symlink"):
                 os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2")
                 self.assertIs(

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

From python-checkins at python.org  Fri Nov 30 22:15:46 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 30 Nov 2012 22:15:46 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Add_Bruno_Dupu?=
	=?utf-8?q?is?=
Message-ID: <3YCpKt2xrPzNLc@mail.python.org>

http://hg.python.org/cpython/rev/1e614dae8448
changeset:   80666:1e614dae8448
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Nov 30 16:15:24 2012 -0500
summary:
  Add Bruno Dupuis

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
@@ -257,6 +257,7 @@
 Robin Dunn
 Luke Dunstan
 Virgil Dupras
+Bruno Dupuis
 Andy Dustman
 Gary Duzan
 Eugene Dvurechenski

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

From python-checkins at python.org  Fri Nov 30 22:15:47 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 30 Nov 2012 22:15:47 +0100 (CET)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_Bruno_Dupuis?=
Message-ID: <3YCpKv5pl8zNVm@mail.python.org>

http://hg.python.org/cpython/rev/6fdc5e3daa8c
changeset:   80667:6fdc5e3daa8c
parent:      80660:ce3f0399ea33
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Nov 30 16:15:24 2012 -0500
summary:
  Add Bruno Dupuis

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
@@ -309,6 +309,7 @@
 Robin Dunn
 Luke Dunstan
 Virgil Dupras
+Bruno Dupuis
 Andy Dustman
 Gary Duzan
 Eugene Dvurechenski

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