Merge remote-tracking branch 'origin/master'

2020-02-06 19:00:26 +01:00
parent 2732488633 e24f8782c2
commit 5d9fd2fac6
7 changed files with 78 additions and 80 deletions
--- a/lib/generictools.py
+++ b/lib/generictools.py
@@ -11,7 +11,10 @@ import re
 import os
 import sys
 import urllib
-import urlparse
+try:
+    import urlparse
+except:
+    import urllib.parse as urlparse
 import datetime
 import time
 import traceback