diff -r 56761e8a4d95 -r a114f080572f UI/UserInterface.py
--- a/UI/UserInterface.py Sun Oct 16 11:44:20 2016 +0200
+++ b/UI/UserInterface.py Mon Oct 17 18:46:35 2016 +0200
@@ -4772,8 +4772,7 @@
pythonDocDir = Utilities.getEnvironmentEntry(
"PYTHON3DOCDIR",
'/usr/share/doc/packages/python3/html')
- if not pythonDocDir.startswith("http://") and \
- not pythonDocDir.startswith("https://"):
+ if not pythonDocDir.startswith(("http://", "https://", "qthelp://")):
if pythonDocDir.startswith("file://"):
pythonDocDir = pythonDocDir[7:]
if not os.path.splitext(pythonDocDir)[1]:
@@ -4836,8 +4835,7 @@
pythonDocDir = Utilities.getEnvironmentEntry(
"PYTHON2DOCDIR",
'/usr/share/doc/packages/python/html')
- if not pythonDocDir.startswith("http://") and \
- not pythonDocDir.startswith("https://"):
+ if not pythonDocDir.startswith(("http://", "https://", "qthelp://")):
if pythonDocDir.startswith("file://"):
pythonDocDir = pythonDocDir[7:]
if not os.path.splitext(pythonDocDir)[1]:
@@ -4954,8 +4952,7 @@
""" has not been configured.</p>"""))
return
- if not pyqt4DocDir.startswith("http://") and \
- not pyqt4DocDir.startswith("https://"):
+ if not pyqt4DocDir.startswith(("http://", "https://", "qthelp://")):
home = ""
if pyqt4DocDir:
if pyqt4DocDir.startswith("file://"):
@@ -5014,8 +5011,7 @@
""" has not been configured.</p>"""))
return
- if not pyqt5DocDir.startswith("http://") and \
- not pyqt5DocDir.startswith("https://"):
+ if not pyqt5DocDir.startswith(("http://", "https://", "qthelp://")):
home = ""
if pyqt5DocDir:
if pyqt5DocDir.startswith("file://"):
@@ -5067,9 +5063,7 @@
home = Utilities.normjoinpath(
getConfig('ericDocDir'), "Source", "index.html")
- if not home.startswith("http://") and \
- not home.startswith("https://") and \
- not home.startswith("qthelp://"):
+ if not home.startswith(("http://", "https://", "qthelp://")):
if not os.path.exists(home):
E5MessageBox.warning(
self,
@@ -5110,8 +5104,7 @@
""" has not been configured.</p>"""))
return
- if not pysideDocDir.startswith("http://") and \
- not pysideDocDir.startswith("https://"):
+ if not pysideDocDir.startswith(("http://", "https://", "qthelp://")):
if pysideDocDir.startswith("file://"):
pysideDocDir = pysideDocDir[7:]
if not os.path.splitext(pysideDocDir)[1]:
