Xqt has submitted this change and it was merged.
Change subject: pwb.py: change path ordering to prioritize own externals ......................................................................
pwb.py: change path ordering to prioritize own externals
After this change, our bundled httplib2 will have priority over any globally-installed version.
Change-Id: I51b018cd428e922cbccda1274d44aaf5232d07fe --- M pwb.py 1 file changed, 4 insertions(+), 4 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py index cfd9358..5ad35d9 100644 --- a/pwb.py +++ b/pwb.py @@ -66,10 +66,10 @@ if not os.path.isabs(rewrite_path): rewrite_path = os.path.abspath(os.path.join(os.curdir, rewrite_path))
-sys.path.append(rewrite_path) -sys.path.append(os.path.join(rewrite_path, 'externals/httplib2')) -sys.path.append(os.path.join(rewrite_path, 'pywikibot/compat')) -sys.path.append(os.path.join(rewrite_path, 'externals')) +sys.path = [sys.path[0], rewrite_path, + os.path.join(rewrite_path, 'pywikibot', 'compat'), + os.path.join(rewrite_path, 'externals') + ] + sys.path[1:]
if "PYWIKIBOT2_DIR" not in os.environ: os.environ["PYWIKIBOT2_DIR"] = os.path.split(__file__)[0]