Cleanup six.moves module (#1180)

* Cleanup six.moves

Regenerate files so all imports are present, comment out imports that fail.
Remove useless files.

* Fix flake8
This commit is contained in:
David Euresti
2017-04-21 16:03:19 -07:00
committed by Jelle Zijlstra
parent a934d57f3b
commit 759da86478
26 changed files with 187 additions and 342 deletions

View File

@@ -1,6 +1,7 @@
# Provisional stubs for six.moves (Python 2.7)
import Cookie as http_cookies
# Stubs for six.moves
#
# Note: Commented out items means they weren't implemented at the time.
# Uncomment them when the modules have been added to the typeshed.
from cStringIO import StringIO as cStringIO
from itertools import ifilter as filter
from itertools import ifilterfalse as filterfalse
@@ -20,14 +21,46 @@ from UserString import UserString as UserString
from __builtin__ import xrange as xrange
from itertools import izip as zip
from itertools import izip_longest as zip_longest
import six.moves.cPickle as cPickle
import HTMLParser as html_parser
import htmlentitydefs as html_entities
import httplib as http_client
import ConfigParser as configparser
import __builtin__ as builtins
import six.moves.urllib_parse as urllib_parse
import six.moves.urllib_error as urllib_error
import ConfigParser as configparser
# import copy_reg as copyreg
# import gdbm as dbm_gnu
# import dummy_thread as _dummy_thread
import cookielib as http_cookiejar
import Cookie as http_cookies
import htmlentitydefs as html_entities
import HTMLParser as html_parser
import httplib as http_client
# import email.MIMEMultipart as email_mime_multipart
# import email.MIMENonMultipart as email_mime_nonmultipart
import email.MIMEText as email_mime_text
# import email.MIMEBase as email_mime_base
import BaseHTTPServer as BaseHTTPServer
# import CGIHTTPServer as CGIHTTPServer
# import SimpleHTTPServer as SimpleHTTPServer
import cPickle as cPickle
import Queue as queue
import repr as reprlib
import SocketServer as socketserver
import thread as _thread
# import Tkinter as tkinter
# import Dialog as tkinter_dialog
# import FileDialog as tkinter_filedialog
# import ScrolledText as tkinter_scrolledtext
# import SimpleDialog as tkinter_simpledialog
# import Tix as tkinter_tix
# import ttk as tkinter_ttk
# import Tkconstants as tkinter_constants
# import Tkdnd as tkinter_dnd
# import tkColorChooser as tkinter_colorchooser
# import tkCommonDialog as tkinter_commondialog
# import tkFileDialog as tkinter_tkfiledialog
# import tkFont as tkinter_font
# import tkMessageBox as tkinter_messagebox
# import tkSimpleDialog as tkinter_tksimpledialog
import six.moves.urllib.parse as urllib_parse
import six.moves.urllib.error as urllib_error
import six.moves.urllib as urllib
import six.moves.urllib_robotparser as urllib_robotparser
import robotparser as urllib_robotparser
# import xmlrpclib as xmlrpc_client
# import SimpleXMLRPCServer as xmlrpc_server

View File

@@ -1,6 +0,0 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.cPickle (Python 2.7)
from cPickle import * # noqa: F403

View File

@@ -1,8 +1,3 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib (Python 2.7)
import six.moves.urllib.error as error
import six.moves.urllib.parse as parse
import six.moves.urllib.request as request

View File

@@ -1,8 +1,3 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib.error (Python 2.7)
from urllib2 import URLError as URLError
from urllib2 import HTTPError as HTTPError
from urllib import ContentTooShortError as ContentTooShortError

View File

@@ -1,30 +1,24 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib.parse (Python 2.7)
from six.moves.urllib_parse import (
ParseResult as ParseResult,
SplitResult as SplitResult,
parse_qs as parse_qs,
parse_qsl as parse_qsl,
urldefrag as urldefrag,
urljoin as urljoin,
urlparse as urlparse,
urlsplit as urlsplit,
urlunparse as urlunparse,
urlunsplit as urlunsplit,
quote as quote,
quote_plus as quote_plus,
unquote as unquote,
unquote_plus as unquote_plus,
urlencode as urlencode,
splitquery as splitquery,
splittag as splittag,
splituser as splituser,
uses_fragment as uses_fragment,
uses_netloc as uses_netloc,
uses_params as uses_params,
uses_query as uses_query,
uses_relative as uses_relative,
)
# Stubs for six.moves.urllib.parse
from urlparse import ParseResult as ParseResult
from urlparse import SplitResult as SplitResult
from urlparse import parse_qs as parse_qs
from urlparse import parse_qsl as parse_qsl
from urlparse import urldefrag as urldefrag
from urlparse import urljoin as urljoin
from urlparse import urlparse as urlparse
from urlparse import urlsplit as urlsplit
from urlparse import urlunparse as urlunparse
from urlparse import urlunsplit as urlunsplit
from urllib import quote as quote
from urllib import quote_plus as quote_plus
from urllib import unquote as unquote
from urllib import unquote_plus as unquote_plus
from urllib import urlencode as urlencode
from urllib import splitquery as splitquery
from urllib import splittag as splittag
from urllib import splituser as splituser
from urlparse import uses_fragment as uses_fragment
from urlparse import uses_netloc as uses_netloc
from urlparse import uses_params as uses_params
from urlparse import uses_query as uses_query
from urlparse import uses_relative as uses_relative

View File

@@ -1,8 +1,4 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib.request (Python 2.7)
# Stubs for six.moves.urllib.request
from urllib2 import urlopen as urlopen
from urllib2 import install_opener as install_opener
from urllib2 import build_opener as build_opener

View File

@@ -1,8 +1,4 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib.response (Python 2.7)
# Stubs for six.moves.urllib.response
from urllib import addbase as addbase
from urllib import addclosehook as addclosehook
from urllib import addinfo as addinfo

View File

@@ -1,6 +1 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib.robotparser (Python 2.7)
from robotparser import RobotFileParser as RobotFileParser

View File

@@ -1,10 +0,0 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib_error (Python 2.7)
from six.moves.urllib.error import (
URLError as URLError,
HTTPError as HTTPError,
ContentTooShortError as ContentTooShortError,
)

View File

@@ -1,28 +0,0 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib_parse (Python 2.7)
from urlparse import ParseResult as ParseResult
from urlparse import SplitResult as SplitResult
from urlparse import parse_qs as parse_qs
from urlparse import parse_qsl as parse_qsl
from urlparse import urldefrag as urldefrag
from urlparse import urljoin as urljoin
from urlparse import urlparse as urlparse
from urlparse import urlsplit as urlsplit
from urlparse import urlunparse as urlunparse
from urlparse import urlunsplit as urlunsplit
from urllib import quote as quote
from urllib import quote_plus as quote_plus
from urllib import unquote as unquote
from urllib import unquote_plus as unquote_plus
from urllib import urlencode as urlencode
from urllib import splitquery as splitquery
from urllib import splittag as splittag
from urllib import splituser as splituser
from urlparse import uses_fragment as uses_fragment
from urlparse import uses_netloc as uses_netloc
from urlparse import uses_params as uses_params
from urlparse import uses_query as uses_query
from urlparse import uses_relative as uses_relative

View File

@@ -1,40 +0,0 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib_request (Python 2.7)
from six.moves.urllib.request import (
urlopen as urlopen,
install_opener as install_opener,
build_opener as build_opener,
pathname2url as pathname2url,
url2pathname as url2pathname,
getproxies as getproxies,
Request as Request,
OpenerDirector as OpenerDirector,
HTTPDefaultErrorHandler as HTTPDefaultErrorHandler,
HTTPRedirectHandler as HTTPRedirectHandler,
HTTPCookieProcessor as HTTPCookieProcessor,
ProxyHandler as ProxyHandler,
BaseHandler as BaseHandler,
HTTPPasswordMgr as HTTPPasswordMgr,
HTTPPasswordMgrWithDefaultRealm as HTTPPasswordMgrWithDefaultRealm,
AbstractBasicAuthHandler as AbstractBasicAuthHandler,
HTTPBasicAuthHandler as HTTPBasicAuthHandler,
ProxyBasicAuthHandler as ProxyBasicAuthHandler,
AbstractDigestAuthHandler as AbstractDigestAuthHandler,
HTTPDigestAuthHandler as HTTPDigestAuthHandler,
ProxyDigestAuthHandler as ProxyDigestAuthHandler,
HTTPHandler as HTTPHandler,
HTTPSHandler as HTTPSHandler,
FileHandler as FileHandler,
FTPHandler as FTPHandler,
CacheFTPHandler as CacheFTPHandler,
UnknownHandler as UnknownHandler,
HTTPErrorProcessor as HTTPErrorProcessor,
urlretrieve as urlretrieve,
urlcleanup as urlcleanup,
URLopener as URLopener,
FancyURLopener as FancyURLopener,
proxy_bypass as proxy_bypass,
)

View File

@@ -1,11 +0,0 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib_response (Python 2.7)
from six.moves.urllib.response import (
addbase as addbase,
addclosehook as addclosehook,
addinfo as addinfo,
addinfourl as addinfourl,
)

View File

@@ -1,8 +0,0 @@
# Generated by stubtool 0.1, DO NOT EDIT
# See https://github.com/o11c/stubtool
#
# Stubs for six.moves.urllib_robotparser (Python 2.7)
from six.moves.urllib.robotparser import (
RobotFileParser as RobotFileParser,
)