rpms/TurboGears/devel TurboGears-1.0.2.2-etree.patch,1.1,1.2

Luke Macken (lmacken) fedora-extras-commits at redhat.com
Fri May 11 07:22:02 UTC 2007


Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30990

Modified Files:
	TurboGears-1.0.2.2-etree.patch 
Log Message:
Update etree patch to work with Python 2.4

TurboGears-1.0.2.2-etree.patch:

Index: TurboGears-1.0.2.2-etree.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.2.2-etree.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.2.2-etree.patch	5 May 2007 07:54:47 -0000	1.1
+++ TurboGears-1.0.2.2-etree.patch	11 May 2007 07:21:28 -0000	1.2
@@ -1,45 +1,55 @@
---- turbogears/docgen.py.orig	2007-05-03 13:12:28.000000000 -0400
-+++ turbogears/docgen.py	2007-05-03 13:13:04.000000000 -0400
-@@ -231,7 +231,7 @@
+--- turbogears/docgen.py.orig	2007-01-05 14:07:06.000000000 -0700
++++ turbogears/docgen.py	2007-05-11 00:04:29.000000000 -0700
+@@ -231,7 +231,10 @@
      def _make_printable(self, tutdir, up_to_root=2):
          endpath = tutdir
          tutdir = os.path.join(self.srcdirs[0], tutdir)
 -        import cElementTree as elementtree
-+        import xml.etree.cElementTree as elementtree
++        try:
++            import xml.etree.cElementTree as elementtree
++        except ImportError:
++            import cElementTree as elementtree
          masterdoc = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <?python import printable ?>
  <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="printable">
-@@ -280,4 +280,4 @@
+@@ -280,4 +283,4 @@
          outfile.write(masterdoc)
          outfile.close()
          self.currentfiles.add(outfn)
 -        
 \ No newline at end of file
 +        
---- turbogears/toolbox/admi18n/pygettext.py.orig	2007-05-03 13:13:43.000000000 -0400
-+++ turbogears/toolbox/admi18n/pygettext.py	2007-05-03 13:14:31.000000000 -0400
-@@ -169,7 +169,7 @@
+--- turbogears/toolbox/admi18n/pygettext.py.orig	2007-01-05 14:07:00.000000000 -0700
++++ turbogears/toolbox/admi18n/pygettext.py	2007-05-11 00:05:08.000000000 -0700
+@@ -169,7 +169,11 @@
  import operator
  import codecs
  
 -from elementtree.ElementTree import ElementTree, XML
-+from xml.etree.ElementTree import ElementTree, XML
++try:
++    from xml.etree.ElementTree import ElementTree, XML
++except ImportError:
++    from elementtree.ElementTree import ElementTree, XML
++
  from turbogears.util import fixentities
  
  __version__ = '1.5'
---- turbogears/command/i18n.py.orig	2007-05-03 13:15:08.000000000 -0400
-+++ turbogears/command/i18n.py	2007-05-03 13:15:25.000000000 -0400
-@@ -10,7 +10,7 @@
+--- turbogears/command/i18n.py.orig	2007-04-21 05:03:16.000000000 -0700
++++ turbogears/command/i18n.py	2007-05-11 00:05:45.000000000 -0700
+@@ -10,7 +10,10 @@
  import optparse
  import tempfile
  
 -from elementtree.ElementTree import ElementTree
-+from xml.etree.ElementTree import ElementTree
++try:
++    from xml.etree.ElementTree import ElementTree
++except ImportError:
++    from elementtree.ElementTree import ElementTree
  
  import formencode
  import turbogears
---- apigen/apigen/element_colorizer.py.orig	2007-05-03 13:16:50.000000000 -0400
-+++ apigen/apigen/element_colorizer.py	2007-05-03 13:17:17.000000000 -0400
+--- apigen/apigen/element_colorizer.py.orig	2007-01-05 14:06:48.000000000 -0700
++++ apigen/apigen/element_colorizer.py	2007-05-11 00:03:40.000000000 -0700
 @@ -2,7 +2,7 @@
  # experimental element colorizer.
  




More information about the fedora-extras-commits mailing list