diff --git a/modules/cmb/backend.py b/modules/cmb/backend.py index 448fdc69..b0e6e296 100644 --- a/modules/cmb/backend.py +++ b/modules/cmb/backend.py @@ -26,7 +26,6 @@ from weboob.tools.browser import BrowserIncorrectPassword, BrokenPageError from weboob.tools.browser2 import BaseBrowser from re import match, compile, sub -from urllib import urlencode from decimal import Decimal from lxml import etree from datetime import date @@ -100,11 +99,6 @@ class CmbBackend(BaseBackend, ICapBank): 'AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405' } - def sslCallBack(self, cert): - pemcert = DER_cert_to_PEM_cert(cert) - certhash = sha256(pemcert).hexdigest() - return certhash == self.CERTHASH - def login(self): data = { 'codeEspace': 'NO', diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index 1ed1b15a..dfde884b 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -328,9 +328,8 @@ class BaseBackend(object): tmpproxys = os.environ['https_proxy'] elif 'HTTPS_PROXY' in os.environ: tmpproxys = os.environ['HTTPS_PROXY'] - print tmpproxys - if tmpproxy is not None or tmpproxys is not None: + if any((tmpproxy, tmpproxys)): kwargs['proxy'] = {} if tmpproxy is not None: kwargs['proxy']['http'] = tmpproxy diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index eaefaa37..1483c37d 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -40,7 +40,6 @@ import hashlib import time import urllib import urllib2 -from urlparse import urlsplit import mimetypes from contextlib import closing from gzip import GzipFile