From 5e0ef46aedc72872d91ad02eedd63a43e43e5e6f Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Thu, 2 May 2013 14:54:52 +0200 Subject: [PATCH] - fixed issue #28 ("calling with -H option causes traceback") --- osc/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc/conf.py b/osc/conf.py index 5ca2dcb4..9b9b2e43 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -48,7 +48,7 @@ try: from urllib.parse import urlsplit from urllib.error import URLError from urllib.request import HTTPBasicAuthHandler, HTTPCookieProcessor, HTTPPasswordMgrWithDefaultRealm, ProxyHandler - from urllib.request import build_opener, proxy_bypass + from urllib.request import AbstractHTTPHandler, build_opener, proxy_bypass except ImportError: #python 2.x from cookielib import LWPCookieJar, CookieJar @@ -56,7 +56,7 @@ except ImportError: from StringIO import StringIO from urlparse import urlsplit from urllib2 import URLError, HTTPBasicAuthHandler, HTTPCookieProcessor, HTTPPasswordMgrWithDefaultRealm, ProxyHandler - from urllib2 import build_opener, proxy_bypass + from urllib2 import AbstractHTTPHandler, build_opener, proxy_bypass from . import OscConfigParser from osc import oscerr