rpms/TurboGears/devel TurboGears-1.0.2.2-etree.patch, NONE, 1.1 TurboGears-1.0.2.2-setuptools.patch, NONE, 1.1 TurboGears-setuptools.patch, 1.4, NONE

Luke Macken (lmacken) fedora-extras-commits at redhat.com
Sat May 5 07:54:51 UTC 2007


Author: lmacken

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

Added Files:
	TurboGears-1.0.2.2-etree.patch 
	TurboGears-1.0.2.2-setuptools.patch 
Removed Files:
	TurboGears-setuptools.patch 
Log Message:
TurboGears-1.0.2.2-etree.patch

TurboGears-1.0.2.2-etree.patch:

--- NEW FILE TurboGears-1.0.2.2-etree.patch ---
--- 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 @@
     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
         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 @@
         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 @@
 import operator
 import codecs
 
-from elementtree.ElementTree import ElementTree, XML
+from xml.etree.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 @@
 import optparse
 import tempfile
 
-from elementtree.ElementTree import ElementTree
+from xml.etree.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
@@ -2,7 +2,7 @@
 # experimental element colorizer.
 
 try:
-    import cElementTree as ET
+    import xml.etree.cElementTree as ET
 except ImportError:
     import elementtree.ElementTree as ET
 

TurboGears-1.0.2.2-setuptools.patch:

--- NEW FILE TurboGears-1.0.2.2-setuptools.patch ---
--- setup.py.orig	2007-05-03 12:32:20.000000000 -0400
+++ setup.py	2007-05-03 12:32:32.000000000 -0400
@@ -16,15 +16,13 @@
         "TurboJson >= 0.9.9",
         "TurboCheetah >= 0.9.5",
         "TurboKid >= 1.0.1",
-        "CherryPy >= 2.2.1,<3.0.0alpha",
         "simplejson >= 1.3",
-        "elementtree >= 1.2.6",
         "PasteScript >= 0.9.7",
         "FormEncode >= 0.7.1",
         "setuptools >= 0.6c2",
         "RuleDispatch >= 0.5a0.dev-r2303",
         "DecoratorTools >= 1.4",
-        "ConfigObj >= 4.3.2"]
+]
 tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
 standard = ["SQLObject>=0.8,<0.10dev"]
 


--- TurboGears-setuptools.patch DELETED ---




More information about the fedora-extras-commits mailing list