Commit 8ea89d3a authored by ntome's avatar ntome

python3: update some references in docs and messages

parent e4397edf
......@@ -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
......
......@@ -38,7 +38,7 @@ try:
# 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']
......
......@@ -44,7 +44,7 @@ try:
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 @@ class Browser(object):
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 @@ class Browser(object):
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,
......
......@@ -43,7 +43,7 @@ try:
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
......
......@@ -32,7 +32,7 @@ import time
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
......
......@@ -156,7 +156,7 @@ class FuturesSession(WeboobSession):
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)
......
......@@ -24,7 +24,7 @@ import re
try:
from dateutil import tz
except ImportError:
raise ImportError('Please install python-dateutil')
raise ImportError('Please install python3-dateutil')
from .compat import range
......
......@@ -22,7 +22,7 @@ import datetime
try:
import feedparser
except ImportError:
raise ImportError('Please install python-feedparser')
raise ImportError('Please install python3-feedparser')
__all__ = ['Entry', 'Newsfeed']
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment