[Python-modules-commits] r12681 - in packages/jinja2/trunk/debian (3 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, April 20, 2010 @ 19:47:59
  Author: piotr
Revision: 12681

* New upstream release
* Add python3_builtins.patch taken from upstream repo (Different name for
  builtins in Python 3)

Added:
  packages/jinja2/trunk/debian/patches/python3_builtins.patch
Modified:
  packages/jinja2/trunk/debian/changelog
  packages/jinja2/trunk/debian/patches/series

Modified: packages/jinja2/trunk/debian/changelog
===================================================================
--- packages/jinja2/trunk/debian/changelog	2010-04-20 19:29:54 UTC (rev 12680)
+++ packages/jinja2/trunk/debian/changelog	2010-04-20 19:47:59 UTC (rev 12681)
@@ -1,3 +1,11 @@
+jinja2 (2.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Add python3_builtins.patch taken from upstream repo (Different name for
+    builtins in Python 3)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 20 Apr 2010 19:51:16 +0200
+
 jinja2 (2.4-3) unstable; urgency=low
 
   * Add missing maintainer scripts in python3-jinja2 package

Added: packages/jinja2/trunk/debian/patches/python3_builtins.patch
===================================================================
--- packages/jinja2/trunk/debian/patches/python3_builtins.patch	                        (rev 0)
+++ packages/jinja2/trunk/debian/patches/python3_builtins.patch	2010-04-20 19:47:59 UTC (rev 12681)
@@ -0,0 +1,14 @@
+# Different name for builtins in Python 3 (changeset 789)
+diff -ruN jinja2-2.4.1//jinja2/utils.py jinja2/jinja2/utils.py
+--- jinja2-2.4.1//jinja2/utils.py	2010-04-20 13:43:42.000000000 +0200
++++ jinja2/jinja2/utils.py	2010-04-20 21:30:18.437823475 +0200
+@@ -236,7 +236,8 @@
+         return 'None'
+     elif obj is Ellipsis:
+         return 'Ellipsis'
+-    if obj.__class__.__module__ == '__builtin__':
++    # __builtin__ in 2.x, builtins in 3.x
++    if obj.__class__.__module__ in ('__builtin__', 'builtins'):
+         name = obj.__class__.__name__
+     else:
+         name = obj.__class__.__module__ + '.' + obj.__class__.__name__

Modified: packages/jinja2/trunk/debian/patches/series
===================================================================
--- packages/jinja2/trunk/debian/patches/series	2010-04-20 19:29:54 UTC (rev 12680)
+++ packages/jinja2/trunk/debian/patches/series	2010-04-20 19:47:59 UTC (rev 12681)
@@ -1 +1,2 @@
 add_version_placeholder.patch
+python3_builtins.patch