[Python-modules-commits] r7007 - in packages/quixote1/trunk (debian/changelog ptl_compile.py)

[morph at users.alioth.debian.org]

    Date: Saturday, November 29, 2008 @ 09:22:55
  Author: morph
Revision: 7007

merging Ben's NMU (v1.2-4.1)

Modified:
  packages/quixote1/trunk/debian/changelog
  packages/quixote1/trunk/ptl_compile.py

Modified: packages/quixote1/trunk/debian/changelog
===================================================================
--- packages/quixote1/trunk/debian/changelog	2008-11-28 16:03:03 UTC (rev 7006)
+++ packages/quixote1/trunk/debian/changelog	2008-11-29 09:22:55 UTC (rev 7007)
@@ -15,6 +15,13 @@
 
  -- Piotr Ożarowski <piotr at debian.org>  Sat,  6 Oct 2007 23:47:23 +0200
 
+quixote1 (1.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Update ptl_compile for compatibility with Python 2.5 (Closes: #484360)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 28 Nov 2008 23:16:58 +0000
+
 quixote1 (1.2-4) unstable; urgency=low
 
   * Updated to the new python policy (Closes: #380926)

Modified: packages/quixote1/trunk/ptl_compile.py
===================================================================
--- packages/quixote1/trunk/ptl_compile.py	2008-11-28 16:03:03 UTC (rev 7006)
+++ packages/quixote1/trunk/ptl_compile.py	2008-11-29 09:22:55 UTC (rev 7007)
@@ -44,6 +44,12 @@
 MARKUP_CLASS = "htmltext"
 MARKUP_MANGLED_CLASS = "_q_htmltext"
 
+# Relative import level argument for "import from" statement
+if sys.version_info >= (2, 5):
+    _from_level = [0]
+else:
+    _from_level = []
+
 class TemplateTransformer(transformer.Transformer):
 
     def __init__(self, *args, **kwargs):
@@ -55,8 +61,9 @@
         # beginning of the module.
         doc = None # self.get_docstring(nodelist, symbol.file_input)
 
-        io_imp = ast.From(IO_MODULE, [(IO_CLASS, None)])
-        markup_imp = ast.From(MARKUP_MODULE, [(MARKUP_CLASS, None)])
+        io_imp = ast.From(IO_MODULE, [(IO_CLASS, None)], *_from_level)
+        markup_imp = ast.From(MARKUP_MODULE, [(MARKUP_CLASS, None)],
+                              *_from_level)
         markup_assign = ast.Assign([ast.AssName(MARKUP_MANGLED_CLASS,
                                                 OP_ASSIGN)],
                                    ast.Name(MARKUP_CLASS))