mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-12-16 09:40:07 +01:00
Merge pull request #2232 from StefanBruens/wxget_pip_optional
Make pip usage in wxget optional
This commit is contained in:
@@ -33,7 +33,6 @@ import os
|
||||
import wx
|
||||
import subprocess
|
||||
import ssl
|
||||
import pip
|
||||
|
||||
if sys.version_info >= (3,):
|
||||
from urllib.error import (HTTPError, URLError)
|
||||
@@ -44,6 +43,11 @@ else:
|
||||
from urllib2 import (HTTPError, URLError)
|
||||
import urlparse
|
||||
|
||||
try:
|
||||
import pip
|
||||
except ImportError as e:
|
||||
pip = None
|
||||
|
||||
def get_docs_demo_url(demo=False):
|
||||
""" Get the URL for the docs or demo."""
|
||||
if demo:
|
||||
@@ -196,8 +200,8 @@ def download_file(url, dest=None, force=False, trusted=False):
|
||||
success = download_wget(url, filename, trusted) # Try wget
|
||||
if not success:
|
||||
success = download_urllib(url, filename) # Try urllib
|
||||
if not success:
|
||||
success = download_pip(url, filename, force, trusted) # Try urllib
|
||||
if not success and pip is not None:
|
||||
success = download_pip(url, filename, force, trusted) # Try pip
|
||||
if not success:
|
||||
split_url = url.split('/')
|
||||
msg = '\n'.join([
|
||||
|
||||
Reference in New Issue
Block a user