diff --git a/debian/changelog b/debian/changelog index 205e400..8e754d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,10 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low DEBEMAIL. (LP: #665202) * Add the beginnings of a test suite. (LP: #690386) - Switch to setuptools, to support setup.py test. + * ubuntutools/common.py: Remove https_proxy unsetting code, working around + LP: #94130. - -- Stefano Rivera Mon, 20 Dec 2010 10:58:53 +0200 + -- Stefano Rivera Mon, 20 Dec 2010 20:54:14 +0200 ubuntu-dev-tools (0.108) experimental; urgency=low diff --git a/ubuntutools/common.py b/ubuntutools/common.py index 571c403..34667aa 100644 --- a/ubuntutools/common.py +++ b/ubuntutools/common.py @@ -15,16 +15,6 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -import os -import sys - -# Clear https_proxy env var as it's not supported in urllib/urllib2; see -# LP #122551 -if os.environ.has_key('https_proxy'): - print >> sys.stderr, "Ignoring https_proxy (no support in urllib/urllib2; see LP #122551)" - del os.environ['https_proxy'] - - def memoize_noargs(func): "Simple memoization wrapper, for functions without arguments" func.cache = None