[Supervisor-checkins] r778 - in meld3/trunk: . meld3

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Mon Jul 21 13:02:31 2008
New Revision: 778

Log:
  Apply patch for Python 2.5 compatibility from both
  Toshio and Anders.



Modified:
   meld3/trunk/CHANGES.txt
   meld3/trunk/meld3/meld3.py
   meld3/trunk/setup.py

Modified: meld3/trunk/CHANGES.txt
==============================================================================
--- meld3/trunk/CHANGES.txt	(original)
+++ meld3/trunk/CHANGES.txt	Mon Jul 21 13:02:31 2008
@@ -1,3 +1,14 @@
+0.6.5
+
+  Apply patch for Python 2.5 compatibility from both
+  Toshio and Anders.
+
+  Create distro tarball via:
+
+   rm MANIFEST
+   USE_MELD3_EXTENSION_MODULES=1 python setup.py sdist
+
+  .. in order to get the cmeld3.c file in the distribution.
 0.6.4
 
   Make the default build use the Python-based meld "helper" instead of

Modified: meld3/trunk/meld3/meld3.py
==============================================================================
--- meld3/trunk/meld3/meld3.py	(original)
+++ meld3/trunk/meld3/meld3.py	Mon Jul 21 13:02:31 2008
@@ -5,21 +5,34 @@
 import mimetools
 from StringIO import StringIO
 
-from elementtree.ElementTree import TreeBuilder
-from elementtree.ElementTree import XMLTreeBuilder
-from elementtree.ElementTree import Comment
-from elementtree.ElementTree import ProcessingInstruction
-from elementtree.ElementTree import QName
-from elementtree.ElementTree import _raise_serialization_error
-from elementtree.ElementTree import _namespace_map
-from elementtree.ElementTree import fixtag
-from elementtree.ElementTree import parse as et_parse
-from elementtree.ElementTree import ElementPath
-from elementtree.HTMLTreeBuilder import HTMLParser
-from elementtree.HTMLTreeBuilder import IGNOREEND
-from elementtree.HTMLTreeBuilder import AUTOCLOSE
-from elementtree.HTMLTreeBuilder import is_not_ascii
-
+try:
+    from elementtree.ElementTree import TreeBuilder
+    from elementtree.ElementTree import XMLTreeBuilder
+    from elementtree.ElementTree import Comment
+    from elementtree.ElementTree import ProcessingInstruction
+    from elementtree.ElementTree import QName
+    from elementtree.ElementTree import _raise_serialization_error
+    from elementtree.ElementTree import _namespace_map
+    from elementtree.ElementTree import fixtag
+    from elementtree.ElementTree import parse as et_parse
+    from elementtree.ElementTree import ElementPath
+except ImportError:
+    from xml.etree.ElementTree import TreeBuilder
+    from xml.etree.ElementTree import XMLTreeBuilder
+    from xml.etree.ElementTree import Comment
+    from xml.etree.ElementTree import ProcessingInstruction
+    from xml.etree.ElementTree import QName
+    from xml.etree.ElementTree import _raise_serialization_error
+    from xml.etree.ElementTree import _namespace_map
+    from xml.etree.ElementTree import fixtag
+    from xml.etree.ElementTree import parse as et_parse
+    from xml.etree.ElementTree import ElementPath
+
+# HTMLTreeBuilder does not exist in python 2.5 standard elementtree
+from HTMLParser import HTMLParser
+AUTOCLOSE = "p", "li", "tr", "th", "td", "head", "body"
+IGNOREEND = "img", "hr", "meta", "link", "br"
+is_not_ascii = re.compile(eval(r'u"[\u0080-\uffff]"')).search
 
 # replace element factory
 def Replace(text, structure=False):

Modified: meld3/trunk/setup.py
==============================================================================
--- meld3/trunk/setup.py	(original)
+++ meld3/trunk/setup.py	Mon Jul 21 13:02:31 2008
@@ -12,7 +12,7 @@
 
 setup(
     name = 'meld3',
-    version = '0.6.4',
+    version = '0.6.5',
     description = 'meld3 is an HTML/XML templating engine.',
     author = 'Chris McDonough',
     author_email =  'chrism at plope.com',