Commit 7352fc86 authored by Łukasz Nowak's avatar Łukasz Nowak

Rewrite workaround: urllib have to be patched early.

Thanks to (un)patching urllib before importing zc.buildout.download no more
M2Crypto cluttering is done.
parent 1761c654
...@@ -37,18 +37,18 @@ import UserDict ...@@ -37,18 +37,18 @@ import UserDict
import warnings import warnings
import subprocess import subprocess
import zc.buildout import zc.buildout
import zc.buildout.download
import zc.buildout.easy_install
# Workaround for https://bugzilla.osafoundation.org/show_bug.cgi?id=13033 # Workaround for https://bugzilla.osafoundation.org/show_bug.cgi?id=13033
# M2Crypto breaks https links # M2Crypto breaks https links
try: try:
from urllib import URLopener import urllib
python_open_https = URLopener.open_https python_open_https = urllib.URLopener.open_https
import M2Crypto import M2Crypto
URLopener.open_https = python_open_https urllib.URLopener.open_https = python_open_https
except ImportError: except ImportError:
pass pass
import zc.buildout.download
import zc.buildout.easy_install
try: try:
import slapos.libnetworkcache import slapos.libnetworkcache
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment