diff --git a/contrib/windows-install/setup-weboob.bat b/contrib/windows-install/setup-weboob.bat index 3479111fc1b3c138833bbeb0cd7033ebd1de4689..3fd043afc3b744f91741b9df81de47fa7a452933 100644 --- a/contrib/windows-install/setup-weboob.bat +++ b/contrib/windows-install/setup-weboob.bat @@ -142,9 +142,6 @@ echo. echo -- html2text %PythonPath%Scripts\easy_install.exe html2text || goto :InstallFailed echo. -echo -- mechanize -%PythonPath%Scripts\easy_install.exe mechanize || goto :InstallFailed -echo. echo -- google-api-python-client %PythonPath%Scripts\easy_install.exe google-api-python-client || goto :InstallFailed echo. diff --git a/setup.py b/setup.py index 138cb944623dfde86eb841557631913ed65b7653..08bbaf5c202c2701a6711c05f57cf3607ca93159 100755 --- a/setup.py +++ b/setup.py @@ -149,7 +149,6 @@ def install_weboob(qt, xdg): 'six', 'unidecode', 'Pillow', - 'mechanize; python_version < "3.0"', 'futures; python_version < "3.2"', ] diff --git a/weboob/tools/newsfeed.py b/weboob/tools/newsfeed.py index cc5bbebfb542a0189fb9f2f7510dab09b101c662..9533bc30352d2f9c97c3de1737955b63d3de5143 100644 --- a/weboob/tools/newsfeed.py +++ b/weboob/tools/newsfeed.py @@ -24,12 +24,6 @@ except ImportError: raise ImportError('Please install python-feedparser') -if '5.1' > feedparser.__version__ >= '5.0': - # feedparser 5.0.x replaces this regexp on sgmllib - # and mechanize < 0.2 fails with malformed pages. - import sgmllib - import re - sgmllib.endbracket = re.compile('[<>]') __all__ = ['Entry', 'Newsfeed']