mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-12-16 01:30:07 +01:00
remove most of Python2 compatibility code
This commit is contained in:
committed by
Scott Talbert
parent
beb9932241
commit
0257f755cf
@@ -31,8 +31,6 @@ Usage: python pywxrc.py -h
|
||||
-o, --output output filename, or - for stdout
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys, os, getopt, glob, re
|
||||
import xml.dom.minidom as minidom
|
||||
from six import byte2int
|
||||
|
||||
@@ -26,22 +26,15 @@ Where URL is a file URL and the optional DEST_DIR is a destination directory to
|
||||
download to, (default is to prompt the user).
|
||||
The --trusted option can be used to suppress certificate checks.
|
||||
"""
|
||||
from __future__ import (division, absolute_import, print_function, unicode_literals)
|
||||
|
||||
import sys
|
||||
import os
|
||||
import wx
|
||||
import subprocess
|
||||
import ssl
|
||||
|
||||
if sys.version_info >= (3,):
|
||||
from urllib.error import (HTTPError, URLError)
|
||||
import urllib.request as urllib2
|
||||
import urllib.parse as urlparse
|
||||
else:
|
||||
import urllib2
|
||||
from urllib2 import (HTTPError, URLError)
|
||||
import urlparse
|
||||
from urllib.error import (HTTPError, URLError)
|
||||
import urllib.request as urllib2
|
||||
import urllib.parse as urlparse
|
||||
|
||||
try:
|
||||
import pip
|
||||
|
||||
@@ -26,24 +26,16 @@ launch it.
|
||||
|
||||
Use: doc|demo --force to force a fresh download.
|
||||
"""
|
||||
from __future__ import (division, absolute_import, print_function, unicode_literals)
|
||||
|
||||
import sys
|
||||
import os
|
||||
import subprocess
|
||||
import webbrowser
|
||||
import tarfile
|
||||
import warnings
|
||||
if sys.version_info >= (3,):
|
||||
from urllib.error import HTTPError
|
||||
import urllib.request as urllib2
|
||||
import urllib.parse as urlparse
|
||||
from urllib.request import pathname2url
|
||||
else:
|
||||
import urllib2
|
||||
from urllib2 import HTTPError
|
||||
import urlparse
|
||||
from urllib import pathname2url
|
||||
from urllib.error import HTTPError
|
||||
import urllib.request as urllib2
|
||||
import urllib.parse as urlparse
|
||||
from urllib.request import pathname2url
|
||||
|
||||
import wx
|
||||
from wx.tools import wxget
|
||||
|
||||
Reference in New Issue
Block a user