Martin von Löwis  committed 6c8cdb0 Merge

merge change from pypi-techtonik

  • Participants
  • Parent commits 5519cd1, 26dc169
  • Branches default

Comments (0)

Files changed (2)

 Required packages
-To run the PyPI software, you need PostgreSQL, and all
-these packages located at PyPI:
+To run the PyPI software, you need Python 2.5+,
+PostgreSQL, and all these packages located at PyPI:
-- cElementTree
 - zope.interface
 - zope.pagetemplate
 - zope.tal
 virtualenv installed::
     $ virtualenv --no-site-packages --distribute .
-    $ bin/easy_install cElementTree zope.interface zope.pagetemplate
+    $ bin/easy_install zope.interface zope.pagetemplate
     $ bin/easy_install zope.tal zope.tales zope.i18nmessageid psycopg2
     $ bin/easy_install docutils M2Crypto python-openid raven
 from zope.pagetemplate.pagetemplatefile import PageTemplateFile
 from distutils.util import rfc822_escape
 from distutils2.metadata import Metadata
+from xml.etree import cElementTree
     import json
 except ImportError:
     class OperationalError(Exception):
-    import cElementTree
-except ImportError:
-    from xml.etree import cElementTree
 # Importing M2Crypto patches urllib; don't let them do that
 orig = urllib.URLopener.open_https.im_func
 from M2Crypto import EVP, DSA