[Pypi-checkins] r789 - trunk/pypi

[martin.von.loewis]

Author: martin.von.loewis
Date: Sat Jul 24 10:15:02 2010
New Revision: 789

Modified:
   trunk/pypi/README
   trunk/pypi/webui.py
Log:
Restore dependency to M2Crypto.


Modified: trunk/pypi/README
==============================================================================
--- trunk/pypi/README	(original)
+++ trunk/pypi/README	Sat Jul 24 10:15:02 2010
@@ -12,6 +12,7 @@
 - zope.i18nmessageid
 - psycopg2 (for testing, sqlite3 might be sufficient)
 - docutils
+- M2Crypto
 - distutils2
 
 Quick development setup
@@ -32,7 +33,7 @@
     $ virtualenv --no-site-packages --distribute .
     $ bin/easy_install cElementTree zope.interface zope.pagetemplate
     $ bin/easy_install zope.tal zope.tales zope.i18nmessageid psycopg2
-    $ bin/easy_install docutils
+    $ bin/easy_install docutils M2Crypto
 
 Then you can launch the server using the pypi.wsgi script::
 

Modified: trunk/pypi/webui.py
==============================================================================
--- trunk/pypi/webui.py	(original)
+++ trunk/pypi/webui.py	Sat Jul 24 10:15:02 2010
@@ -18,6 +18,11 @@
 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
+urllib.URLopener.open_https = orig
+
 # local imports
 import store, config, versionpredicate, verify_filetype, rpc
 import MailingLogger, openid2rp