This commit is contained in:
Jean-Francois Dockes 2019-01-25 15:01:03 +01:00
parent 096ab4454b
commit 91d20ea363

View File

@ -15,12 +15,10 @@ if PY3:
from urllib.parse import unquote as urllib_unquote from urllib.parse import unquote as urllib_unquote
from urllib.parse import urlparse as urlparse_urlparse from urllib.parse import urlparse as urlparse_urlparse
from html.parser import HTMLParser from html.parser import HTMLParser
chmpackname = 'pychm3.egg'
else: else:
from urlparse import urlparse as urlparse_urlparse from urlparse import urlparse as urlparse_urlparse
from urllib import unquote as urllib_unquote from urllib import unquote as urllib_unquote
from HTMLParser import HTMLParser from HTMLParser import HTMLParser
chmpackname = 'pychm2.egg'
import subprocess import subprocess
@ -28,12 +26,12 @@ import rclconfig
import rclexecm import rclexecm
# pychm has no official port to Python3, hence no package in the # pychm has no official port to Python3, hence no package in the
# standard place. Recoll bundles a python3 port which we install out # standard place. Linux Recoll bundles a python3 port which is identical
# of the standard python places. Look for it: # to pychm, but named recollchm to avoid conflicts because it is installed
# sys.path[0] is for MSW, where we install the egg in the filters # as a normal python package (in /usr/lib/pythonxx/dist-packages,
# directory? TBD for now # not recoll/filters.). No such issues on Windows
try: try:
# First try the system version if any # First try the system (or recoll-local on Windows) version if any
from chm import chm,chmlib from chm import chm,chmlib
except: except:
try: try: