From 8ea89d3a62df6ea0185cc0b557f41f58eaf83ca1 Mon Sep 17 00:00:00 2001 From: Vincent A Date: Sat, 26 Oct 2019 17:31:18 +0200 Subject: [PATCH] python3: update some references in docs and messages --- INSTALL | 5 ++--- modules/youtube/module.py | 2 +- weboob/browser/browsers.py | 6 +++--- weboob/browser/nss.py | 2 +- weboob/browser/selenium.py | 2 +- weboob/browser/sessions.py | 2 +- weboob/tools/date.py | 2 +- weboob/tools/newsfeed.py | 2 +- weboob/tools/pdf.py | 6 +++--- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/INSTALL b/INSTALL index 9696ef3457..494eff409f 100644 --- a/INSTALL +++ b/INSTALL @@ -10,7 +10,7 @@ you have to handle them by hand, according to your distribution. The requirements are provided in ``setup.py``, except for: * gpgv (for secure updates). If not packaged alone, it should be in ``gnupg`` or ``gpg``. -* PyQt5 (python-pyqt5, pyqt5-dev-tools, python-pyqt5.qtmultimedia) for graphical applications. +* PyQt5 (python3-pyqt5, pyqt5-dev-tools, python3-pyqt5.qtmultimedia) for graphical applications. * For more performance, ensure you have ``libyaml`` and ``simplejson`` installed. Some modules may have more dependencies. @@ -36,8 +36,7 @@ System installation (discouraged) --------------------------------- The install mode copies files to the Python system-wide packages directory (for -example ``/usr/lib/python2.5/site-packages`` for Python 2.5, or -``/usr/local/lib/python2.6/dist-packages`` for Python 2.6). :: +example ``/usr/lib/python3.7/dist-packages`` for Python 3.7. :: # ./setup.py install diff --git a/modules/youtube/module.py b/modules/youtube/module.py index 0ae759dc15..c56b87c457 100644 --- a/modules/youtube/module.py +++ b/modules/youtube/module.py @@ -38,7 +38,7 @@ # so apiclient must be imported after from apiclient.discovery import build as ytbuild except ImportError: - raise ImportError("Please install python-googleapi") + raise ImportError("Please install python3-googleapi") __all__ = ['YoutubeModule'] diff --git a/weboob/browser/browsers.py b/weboob/browser/browsers.py index 322f5c4611..1664817b59 100644 --- a/weboob/browser/browsers.py +++ b/weboob/browser/browsers.py @@ -44,7 +44,7 @@ if int(requests.__version__.split('.')[0]) < 2: raise ImportError() except ImportError: - raise ImportError('Please install python-requests >= 2.0') + raise ImportError('Please install python3-requests >= 2.0') from weboob.exceptions import BrowserHTTPSDowngrade, ModuleInstallError, BrowserRedirect, BrowserIncorrectPassword @@ -212,7 +212,7 @@ def _create_session(self): def _setup_session(self, profile): """ - Set up a python-requests session for our usage. + Set up a python3-requests session for our usage. """ session = self._create_session() @@ -366,7 +366,7 @@ def inner_callback(future, response): self.raise_for_status(response) return callback(response) - # call python-requests + # call python3-requests response = self.session.send(preq, allow_redirects=allow_redirects, stream=stream, diff --git a/weboob/browser/nss.py b/weboob/browser/nss.py index e37c03d840..7fe36a4036 100644 --- a/weboob/browser/nss.py +++ b/weboob/browser/nss.py @@ -43,7 +43,7 @@ import nss.error import nss.nss except ImportError: - raise ImportError('Please install python-nss') + raise ImportError('Please install python3-nss') from requests.packages.urllib3.util.ssl_ import ssl_wrap_socket as old_ssl_wrap_socket import requests # for AIA from weboob.tools.log import getLogger diff --git a/weboob/browser/selenium.py b/weboob/browser/selenium.py index e5a2b1aaa0..42f3d3bc4a 100644 --- a/weboob/browser/selenium.py +++ b/weboob/browser/selenium.py @@ -32,7 +32,7 @@ try: from selenium import webdriver except ImportError: - raise ImportError('Please install python-selenium') + raise ImportError('Please install python3-selenium') from selenium.webdriver.common.desired_capabilities import DesiredCapabilities from selenium.webdriver.common.proxy import Proxy, ProxyType diff --git a/weboob/browser/sessions.py b/weboob/browser/sessions.py index f6630de479..8315f1c7b6 100644 --- a/weboob/browser/sessions.py +++ b/weboob/browser/sessions.py @@ -156,7 +156,7 @@ def func(*args, **kwargs): if is_async: if not self.executor: - raise ImportError('Please install python-concurrent.futures') + raise ImportError('Please install python3-concurrent.futures') return self.executor.submit(func, *args, **kwargs) return func(*args, **kwargs) diff --git a/weboob/tools/date.py b/weboob/tools/date.py index 51306f6e90..fb07eaf6f7 100644 --- a/weboob/tools/date.py +++ b/weboob/tools/date.py @@ -24,7 +24,7 @@ try: from dateutil import tz except ImportError: - raise ImportError('Please install python-dateutil') + raise ImportError('Please install python3-dateutil') from .compat import range diff --git a/weboob/tools/newsfeed.py b/weboob/tools/newsfeed.py index 248301b1eb..ee34bf90e7 100644 --- a/weboob/tools/newsfeed.py +++ b/weboob/tools/newsfeed.py @@ -22,7 +22,7 @@ try: import feedparser except ImportError: - raise ImportError('Please install python-feedparser') + raise ImportError('Please install python3-feedparser') __all__ = ['Entry', 'Newsfeed'] diff --git a/weboob/tools/pdf.py b/weboob/tools/pdf.py index e79632d33b..ab4fef0bcd 100644 --- a/weboob/tools/pdf.py +++ b/weboob/tools/pdf.py @@ -306,7 +306,7 @@ def get_pdf_rows(data, miner_layout=True): try: from pdfminer.pdfparser import PDFParser, PDFSyntaxError except ImportError: - raise ImportError('Please install python-pdfminer') + raise ImportError('Please install python3-pdfminer') try: from pdfminer.pdfdocument import PDFDocument @@ -434,7 +434,7 @@ def html_to_pdf(browser, url=None, data=None, extra_options=None): try: import pdfkit # https://pypi.python.org/pypi/pdfkit except ImportError: - raise ImportError('Please install python-pdfkit') + raise ImportError('Please install python3-pdfkit') assert (url or data) and not (url and data), 'Please give only url or data parameter' @@ -470,7 +470,7 @@ def extract_text(data): from pdfminer.converter import TextConverter from pdfminer.pdfinterp import PDFResourceManager, PDFPageInterpreter except ImportError: - raise ImportError('Please install python-pdfminer to parse PDF') + raise ImportError('Please install python3-pdfminer to parse PDF') else: parser = PDFParser(BytesIO(data)) try: -- GitLab