Commit 27f2ac76 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge branch 'bug_778748'

parents c007684e 7352fc86
......@@ -37,18 +37,18 @@ import UserDict
import warnings
import subprocess
import zc.buildout
import zc.buildout.download
import zc.buildout.easy_install
# Workaround for https://bugzilla.osafoundation.org/show_bug.cgi?id=13033
# M2Crypto breaks https links
try:
from urllib import URLopener
python_open_https = URLopener.open_https
import urllib
python_open_https = urllib.URLopener.open_https
import M2Crypto
URLopener.open_https = python_open_https
urllib.URLopener.open_https = python_open_https
except ImportError:
pass
import zc.buildout.download
import zc.buildout.easy_install
try:
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