Remove automatic use of system six
* Enable the pylint no-name-in-module check. Checks that identifiers in
imports actually exist. When we do this, we also have to ignore
_MovedItems used in our bundled six. This means pylint won't check
for bad imports below ansible.module_utils.six.moves but that's
something that pylint punts on with a system copy of six so this is
still an improvement.
* Remove automatic use of system six. The exec in the six code which
tried to use a system library if available destroyed pylint's ability
to check for imports of identifiers which did not exist (the
no-name-in-module check). That test is important enough that we
should sacrifice the bundling detection in favour of the test.
Distributions that want to unbundle six can replace the bundled six in
ansible/module_utils/six/__init__.py to unbundle. however, be aware
that six is tricky to unbundle. They may want to base their efforts
off the code we were using:
2fff690caa/lib/ansible/module_utils/six/__init__.py
* Update tests for new location of bundled six Several code-smell tests
whitelist the bundled six library. Update the path to the library so
that they work.
* Also check for basestring in modules as the enabled pylint tests will
also point out basestring usage for us.
This commit is contained in:
Toshio Kuratomi
parent
da3d3d512e
commit
9f7b0dfc30
16 changed files with 895 additions and 995 deletions
|
|
@ -91,6 +91,13 @@ Ansible Changes By Release
|
||||||
* Added better cookie parsing to fetch_url/open_url. Cookies are now in a dictionary named `cookies`
|
* Added better cookie parsing to fetch_url/open_url. Cookies are now in a dictionary named `cookies`
|
||||||
in the fetch_url result. Anything using `open_url` directly can pass a cookie object as a named arg
|
in the fetch_url result. Anything using `open_url` directly can pass a cookie object as a named arg
|
||||||
(`cookies`), and then parse/format the cookies in the result.
|
(`cookies`), and then parse/format the cookies in the result.
|
||||||
|
* The bundled copy of six in lib/ansible/module_utils/six is now used
|
||||||
|
unconditionally. The code to fallback on a system six interfered with static
|
||||||
|
analysis of the code so the cost of using the fallback code became too high.
|
||||||
|
Distributions which wish to unbundle may do so by replacing the bundled six
|
||||||
|
in ansible/module_utils/six/__init__.py. Six is tricky to unbundle, however,
|
||||||
|
so they may want to base their efforts off the code we were using:
|
||||||
|
* https://github.com/ansible/ansible/blob/2fff690caab6a1c6a81973f704be3fbd0bde2c2f/lib/ansible/module_utils/six/__init__.py
|
||||||
|
|
||||||
#### New Callbacks:
|
#### New Callbacks:
|
||||||
- profile_roles
|
- profile_roles
|
||||||
|
|
|
||||||
|
|
@ -1,116 +1,871 @@
|
||||||
# This code is part of Ansible, but is an independent component.
|
"""Utilities for writing code that runs on Python 2 and 3"""
|
||||||
# This particular file snippet, and this file snippet only, is BSD licensed.
|
# This code is strewn with things that are not defined on Python3 (unicode,
|
||||||
# Modules you write using this snippet, which is embedded dynamically by Ansible
|
# long, etc) but they are all shielded by version checks. This is also an
|
||||||
# still belong to the author of the module, and may assign their own license
|
# upstrem vendored file that we're not going to modify on our own
|
||||||
# to the complete work.
|
# pylint: disable=undefined-variable
|
||||||
#
|
|
||||||
# Copyright (c) 2017, Toshio Kuratomi <tkuratomi@ansible.com>
|
# Copyright (c) 2010-2015 Benjamin Peterson
|
||||||
#
|
#
|
||||||
# This code is based on code from Astropy and retains their 3-clause BSD license
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
# reproduced below:
|
# of this software and associated documentation files (the "Software"), to deal
|
||||||
#
|
# in the Software without restriction, including without limitation the rights
|
||||||
# Copyright (c) 2011-2016, Astropy Developers
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
#
|
# copies of the Software, and to permit persons to whom the Software is
|
||||||
# All rights reserved.
|
# furnished to do so, subject to the following conditions:
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# The above copyright notice and this permission notice shall be included in all
|
||||||
# modification, are permitted provided that the following conditions are met:
|
# copies or substantial portions of the Software.
|
||||||
#
|
#
|
||||||
# * Redistributions of source code must retain the above copyright notice, this
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
# list of conditions and the following disclaimer.
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
# * Redistributions in binary form must reproduce the above copyright notice,
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
# this list of conditions and the following disclaimer in the documentation
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
# and/or other materials provided with the distribution.
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
# * Neither the name of the Astropy Team nor the names of its contributors may
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
# be used to endorse or promote products derived from this software without
|
# SOFTWARE.
|
||||||
# specific prior written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
||||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
||||||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
# Astropy License: https://github.com/astropy/astropy/blob/cf3265e42a0db8e00bb90644db37c8150f5ac00c/licenses/LICENSE.rst
|
|
||||||
# Astropy Code: https://github.com/astropy/astropy/blob/cf3265e42a0db8e00bb90644db37c8150f5ac00c/astropy/extern/six.py
|
|
||||||
|
|
||||||
"""
|
|
||||||
Handle loading six package from system or from the bundled copy
|
|
||||||
"""
|
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
import imp as _imp
|
import functools
|
||||||
import sys as _sys
|
import itertools
|
||||||
|
import operator
|
||||||
|
import sys
|
||||||
|
import types
|
||||||
|
|
||||||
try:
|
__author__ = "Benjamin Peterson <benjamin@python.org>"
|
||||||
from distutils.version import LooseVersion as _LooseVersion
|
__version__ = "1.10.0"
|
||||||
except ImportError:
|
|
||||||
# Some platforms *cough*Solaris*cough* don't ship the whole stdlib
|
|
||||||
_LooseVersion = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
import six as _system_six
|
|
||||||
except ImportError:
|
|
||||||
_system_six = None
|
|
||||||
|
|
||||||
from . import _six as _bundled_six
|
|
||||||
|
|
||||||
|
|
||||||
def _find_module(name, path=None):
|
# Useful for very coarse version differentiation.
|
||||||
"""Alternative to `imp.find_module` that can also search in subpackages"""
|
PY2 = sys.version_info[0] == 2
|
||||||
parts = name.split('.')
|
PY3 = sys.version_info[0] == 3
|
||||||
|
PY34 = sys.version_info[0:2] >= (3, 4)
|
||||||
|
|
||||||
for part in parts:
|
if PY3:
|
||||||
if path is not None:
|
string_types = str,
|
||||||
path = [path]
|
integer_types = int,
|
||||||
fh, path, descr = _imp.find_module(part, path)
|
class_types = type,
|
||||||
return fh, path, descr
|
text_type = str
|
||||||
|
binary_type = bytes
|
||||||
|
MAXSIZE = sys.maxsize
|
||||||
|
else:
|
||||||
|
string_types = basestring,
|
||||||
|
integer_types = (int, long)
|
||||||
|
class_types = (type, types.ClassType)
|
||||||
|
text_type = unicode
|
||||||
|
binary_type = str
|
||||||
|
|
||||||
|
if sys.platform.startswith("java"):
|
||||||
def _get_bundled_six_source():
|
# Jython always uses 32 bits.
|
||||||
# Special import loader (zipimport for instance)
|
MAXSIZE = int((1 << 31) - 1)
|
||||||
found = False
|
|
||||||
for path in _sys.path:
|
|
||||||
importer = _sys.path_importer_cache.get(path)
|
|
||||||
if importer:
|
|
||||||
try:
|
|
||||||
found = importer.find_module('ansible/module_utils/six/_six')
|
|
||||||
except ImportError:
|
|
||||||
continue
|
|
||||||
if found:
|
|
||||||
break
|
|
||||||
else:
|
else:
|
||||||
raise ImportError("Could not find ansible.module_utils.six._six")
|
# It's possible to have sizeof(long) != sizeof(Py_ssize_t).
|
||||||
|
class X(object):
|
||||||
|
|
||||||
module_source = importer.get_source('ansible/module_utils/six/_six')
|
def __len__(self):
|
||||||
return module_source
|
return 1 << 31
|
||||||
|
|
||||||
|
|
||||||
def _get_six_source():
|
|
||||||
"""Import the newest version of the six library that's available"""
|
|
||||||
mod_info = None
|
|
||||||
try:
|
|
||||||
if _system_six and _LooseVersion and \
|
|
||||||
_LooseVersion(_system_six.__version__) >= _LooseVersion(_bundled_six.__version__):
|
|
||||||
mod_info = _find_module('six')
|
|
||||||
except:
|
|
||||||
# Any errors finding the system library, use our bundled lib instead
|
|
||||||
pass
|
|
||||||
|
|
||||||
if not mod_info:
|
|
||||||
try:
|
try:
|
||||||
mod_info = _find_module('ansible.module_utils.six._six')
|
len(X())
|
||||||
except ImportError:
|
except OverflowError:
|
||||||
# zipimport
|
# 32-bit
|
||||||
module_source = _get_bundled_six_source()
|
MAXSIZE = int((1 << 31) - 1)
|
||||||
return module_source
|
else:
|
||||||
|
# 64-bit
|
||||||
|
MAXSIZE = int((1 << 63) - 1)
|
||||||
|
del X
|
||||||
|
|
||||||
return mod_info[0].read()
|
|
||||||
|
|
||||||
source = _get_six_source()
|
def _add_doc(func, doc):
|
||||||
exec(source)
|
"""Add documentation to a function."""
|
||||||
|
func.__doc__ = doc
|
||||||
|
|
||||||
|
|
||||||
|
def _import_module(name):
|
||||||
|
"""Import module, returning the module after the last dot."""
|
||||||
|
__import__(name)
|
||||||
|
return sys.modules[name]
|
||||||
|
|
||||||
|
|
||||||
|
class _LazyDescr(object):
|
||||||
|
|
||||||
|
def __init__(self, name):
|
||||||
|
self.name = name
|
||||||
|
|
||||||
|
def __get__(self, obj, tp):
|
||||||
|
result = self._resolve()
|
||||||
|
setattr(obj, self.name, result) # Invokes __set__.
|
||||||
|
try:
|
||||||
|
# This is a bit ugly, but it avoids running this again by
|
||||||
|
# removing this descriptor.
|
||||||
|
delattr(obj.__class__, self.name)
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
class MovedModule(_LazyDescr):
|
||||||
|
|
||||||
|
def __init__(self, name, old, new=None):
|
||||||
|
super(MovedModule, self).__init__(name)
|
||||||
|
if PY3:
|
||||||
|
if new is None:
|
||||||
|
new = name
|
||||||
|
self.mod = new
|
||||||
|
else:
|
||||||
|
self.mod = old
|
||||||
|
|
||||||
|
def _resolve(self):
|
||||||
|
return _import_module(self.mod)
|
||||||
|
|
||||||
|
def __getattr__(self, attr):
|
||||||
|
_module = self._resolve()
|
||||||
|
value = getattr(_module, attr)
|
||||||
|
setattr(self, attr, value)
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
class _LazyModule(types.ModuleType):
|
||||||
|
|
||||||
|
def __init__(self, name):
|
||||||
|
super(_LazyModule, self).__init__(name)
|
||||||
|
self.__doc__ = self.__class__.__doc__
|
||||||
|
|
||||||
|
def __dir__(self):
|
||||||
|
attrs = ["__doc__", "__name__"]
|
||||||
|
attrs += [attr.name for attr in self._moved_attributes]
|
||||||
|
return attrs
|
||||||
|
|
||||||
|
# Subclasses should override this
|
||||||
|
_moved_attributes = []
|
||||||
|
|
||||||
|
|
||||||
|
class MovedAttribute(_LazyDescr):
|
||||||
|
|
||||||
|
def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
|
||||||
|
super(MovedAttribute, self).__init__(name)
|
||||||
|
if PY3:
|
||||||
|
if new_mod is None:
|
||||||
|
new_mod = name
|
||||||
|
self.mod = new_mod
|
||||||
|
if new_attr is None:
|
||||||
|
if old_attr is None:
|
||||||
|
new_attr = name
|
||||||
|
else:
|
||||||
|
new_attr = old_attr
|
||||||
|
self.attr = new_attr
|
||||||
|
else:
|
||||||
|
self.mod = old_mod
|
||||||
|
if old_attr is None:
|
||||||
|
old_attr = name
|
||||||
|
self.attr = old_attr
|
||||||
|
|
||||||
|
def _resolve(self):
|
||||||
|
module = _import_module(self.mod)
|
||||||
|
return getattr(module, self.attr)
|
||||||
|
|
||||||
|
|
||||||
|
class _SixMetaPathImporter(object):
|
||||||
|
|
||||||
|
"""
|
||||||
|
A meta path importer to import six.moves and its submodules.
|
||||||
|
|
||||||
|
This class implements a PEP302 finder and loader. It should be compatible
|
||||||
|
with Python 2.5 and all existing versions of Python3
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, six_module_name):
|
||||||
|
self.name = six_module_name
|
||||||
|
self.known_modules = {}
|
||||||
|
|
||||||
|
def _add_module(self, mod, *fullnames):
|
||||||
|
for fullname in fullnames:
|
||||||
|
self.known_modules[self.name + "." + fullname] = mod
|
||||||
|
|
||||||
|
def _get_module(self, fullname):
|
||||||
|
return self.known_modules[self.name + "." + fullname]
|
||||||
|
|
||||||
|
def find_module(self, fullname, path=None):
|
||||||
|
if fullname in self.known_modules:
|
||||||
|
return self
|
||||||
|
return None
|
||||||
|
|
||||||
|
def __get_module(self, fullname):
|
||||||
|
try:
|
||||||
|
return self.known_modules[fullname]
|
||||||
|
except KeyError:
|
||||||
|
raise ImportError("This loader does not know module " + fullname)
|
||||||
|
|
||||||
|
def load_module(self, fullname):
|
||||||
|
try:
|
||||||
|
# in case of a reload
|
||||||
|
return sys.modules[fullname]
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
mod = self.__get_module(fullname)
|
||||||
|
if isinstance(mod, MovedModule):
|
||||||
|
mod = mod._resolve()
|
||||||
|
else:
|
||||||
|
mod.__loader__ = self
|
||||||
|
sys.modules[fullname] = mod
|
||||||
|
return mod
|
||||||
|
|
||||||
|
def is_package(self, fullname):
|
||||||
|
"""
|
||||||
|
Return true, if the named module is a package.
|
||||||
|
|
||||||
|
We need this method to get correct spec objects with
|
||||||
|
Python 3.4 (see PEP451)
|
||||||
|
"""
|
||||||
|
return hasattr(self.__get_module(fullname), "__path__")
|
||||||
|
|
||||||
|
def get_code(self, fullname):
|
||||||
|
"""Return None
|
||||||
|
|
||||||
|
Required, if is_package is implemented"""
|
||||||
|
self.__get_module(fullname) # eventually raises ImportError
|
||||||
|
return None
|
||||||
|
get_source = get_code # same as get_code
|
||||||
|
|
||||||
|
_importer = _SixMetaPathImporter(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class _MovedItems(_LazyModule):
|
||||||
|
|
||||||
|
"""Lazy loading of moved objects"""
|
||||||
|
__path__ = [] # mark as package
|
||||||
|
|
||||||
|
|
||||||
|
_moved_attributes = [
|
||||||
|
MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
|
||||||
|
MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
|
||||||
|
MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
|
||||||
|
MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
|
||||||
|
MovedAttribute("intern", "__builtin__", "sys"),
|
||||||
|
MovedAttribute("map", "itertools", "builtins", "imap", "map"),
|
||||||
|
MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
|
||||||
|
MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
|
||||||
|
MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
|
||||||
|
MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
|
||||||
|
MovedAttribute("reduce", "__builtin__", "functools"),
|
||||||
|
MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
|
||||||
|
MovedAttribute("StringIO", "StringIO", "io"),
|
||||||
|
MovedAttribute("UserDict", "UserDict", "collections"),
|
||||||
|
MovedAttribute("UserList", "UserList", "collections"),
|
||||||
|
MovedAttribute("UserString", "UserString", "collections"),
|
||||||
|
MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
|
||||||
|
MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
|
||||||
|
MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
|
||||||
|
MovedModule("builtins", "__builtin__"),
|
||||||
|
MovedModule("configparser", "ConfigParser"),
|
||||||
|
MovedModule("copyreg", "copy_reg"),
|
||||||
|
MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
|
||||||
|
MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
|
||||||
|
MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
|
||||||
|
MovedModule("http_cookies", "Cookie", "http.cookies"),
|
||||||
|
MovedModule("html_entities", "htmlentitydefs", "html.entities"),
|
||||||
|
MovedModule("html_parser", "HTMLParser", "html.parser"),
|
||||||
|
MovedModule("http_client", "httplib", "http.client"),
|
||||||
|
MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
|
||||||
|
MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
|
||||||
|
MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
|
||||||
|
MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
|
||||||
|
MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
|
||||||
|
MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
|
||||||
|
MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
|
||||||
|
MovedModule("cPickle", "cPickle", "pickle"),
|
||||||
|
MovedModule("queue", "Queue"),
|
||||||
|
MovedModule("reprlib", "repr"),
|
||||||
|
MovedModule("socketserver", "SocketServer"),
|
||||||
|
MovedModule("_thread", "thread", "_thread"),
|
||||||
|
MovedModule("tkinter", "Tkinter"),
|
||||||
|
MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
|
||||||
|
MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
|
||||||
|
MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
|
||||||
|
MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
|
||||||
|
MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
|
||||||
|
MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
|
||||||
|
MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
|
||||||
|
MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
|
||||||
|
MovedModule("tkinter_colorchooser", "tkColorChooser",
|
||||||
|
"tkinter.colorchooser"),
|
||||||
|
MovedModule("tkinter_commondialog", "tkCommonDialog",
|
||||||
|
"tkinter.commondialog"),
|
||||||
|
MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
|
||||||
|
MovedModule("tkinter_font", "tkFont", "tkinter.font"),
|
||||||
|
MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
|
||||||
|
MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
|
||||||
|
"tkinter.simpledialog"),
|
||||||
|
MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
|
||||||
|
MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
|
||||||
|
MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
|
||||||
|
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
|
||||||
|
MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
|
||||||
|
MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
|
||||||
|
]
|
||||||
|
# Add windows specific modules.
|
||||||
|
if sys.platform == "win32":
|
||||||
|
_moved_attributes += [
|
||||||
|
MovedModule("winreg", "_winreg"),
|
||||||
|
]
|
||||||
|
|
||||||
|
for attr in _moved_attributes:
|
||||||
|
setattr(_MovedItems, attr.name, attr)
|
||||||
|
if isinstance(attr, MovedModule):
|
||||||
|
_importer._add_module(attr, "moves." + attr.name)
|
||||||
|
del attr
|
||||||
|
|
||||||
|
_MovedItems._moved_attributes = _moved_attributes
|
||||||
|
|
||||||
|
moves = _MovedItems(__name__ + ".moves")
|
||||||
|
_importer._add_module(moves, "moves")
|
||||||
|
|
||||||
|
|
||||||
|
class Module_six_moves_urllib_parse(_LazyModule):
|
||||||
|
|
||||||
|
"""Lazy loading of moved objects in six.moves.urllib_parse"""
|
||||||
|
|
||||||
|
|
||||||
|
_urllib_parse_moved_attributes = [
|
||||||
|
MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("urljoin", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("urlparse", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("quote", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("quote_plus", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("unquote", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("urlencode", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("splitquery", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("splittag", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("splituser", "urllib", "urllib.parse"),
|
||||||
|
MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("uses_params", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("uses_query", "urlparse", "urllib.parse"),
|
||||||
|
MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
|
||||||
|
]
|
||||||
|
for attr in _urllib_parse_moved_attributes:
|
||||||
|
setattr(Module_six_moves_urllib_parse, attr.name, attr)
|
||||||
|
del attr
|
||||||
|
|
||||||
|
Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
|
||||||
|
|
||||||
|
_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
|
||||||
|
"moves.urllib_parse", "moves.urllib.parse")
|
||||||
|
|
||||||
|
|
||||||
|
class Module_six_moves_urllib_error(_LazyModule):
|
||||||
|
|
||||||
|
"""Lazy loading of moved objects in six.moves.urllib_error"""
|
||||||
|
|
||||||
|
|
||||||
|
_urllib_error_moved_attributes = [
|
||||||
|
MovedAttribute("URLError", "urllib2", "urllib.error"),
|
||||||
|
MovedAttribute("HTTPError", "urllib2", "urllib.error"),
|
||||||
|
MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
|
||||||
|
]
|
||||||
|
for attr in _urllib_error_moved_attributes:
|
||||||
|
setattr(Module_six_moves_urllib_error, attr.name, attr)
|
||||||
|
del attr
|
||||||
|
|
||||||
|
Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
|
||||||
|
|
||||||
|
_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
|
||||||
|
"moves.urllib_error", "moves.urllib.error")
|
||||||
|
|
||||||
|
|
||||||
|
class Module_six_moves_urllib_request(_LazyModule):
|
||||||
|
|
||||||
|
"""Lazy loading of moved objects in six.moves.urllib_request"""
|
||||||
|
|
||||||
|
|
||||||
|
_urllib_request_moved_attributes = [
|
||||||
|
MovedAttribute("urlopen", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("install_opener", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("build_opener", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("pathname2url", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("url2pathname", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("getproxies", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("Request", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("FileHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
|
||||||
|
MovedAttribute("urlretrieve", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("urlcleanup", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("URLopener", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
|
||||||
|
MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
|
||||||
|
]
|
||||||
|
for attr in _urllib_request_moved_attributes:
|
||||||
|
setattr(Module_six_moves_urllib_request, attr.name, attr)
|
||||||
|
del attr
|
||||||
|
|
||||||
|
Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
|
||||||
|
|
||||||
|
_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
|
||||||
|
"moves.urllib_request", "moves.urllib.request")
|
||||||
|
|
||||||
|
|
||||||
|
class Module_six_moves_urllib_response(_LazyModule):
|
||||||
|
|
||||||
|
"""Lazy loading of moved objects in six.moves.urllib_response"""
|
||||||
|
|
||||||
|
|
||||||
|
_urllib_response_moved_attributes = [
|
||||||
|
MovedAttribute("addbase", "urllib", "urllib.response"),
|
||||||
|
MovedAttribute("addclosehook", "urllib", "urllib.response"),
|
||||||
|
MovedAttribute("addinfo", "urllib", "urllib.response"),
|
||||||
|
MovedAttribute("addinfourl", "urllib", "urllib.response"),
|
||||||
|
]
|
||||||
|
for attr in _urllib_response_moved_attributes:
|
||||||
|
setattr(Module_six_moves_urllib_response, attr.name, attr)
|
||||||
|
del attr
|
||||||
|
|
||||||
|
Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
|
||||||
|
|
||||||
|
_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
|
||||||
|
"moves.urllib_response", "moves.urllib.response")
|
||||||
|
|
||||||
|
|
||||||
|
class Module_six_moves_urllib_robotparser(_LazyModule):
|
||||||
|
|
||||||
|
"""Lazy loading of moved objects in six.moves.urllib_robotparser"""
|
||||||
|
|
||||||
|
|
||||||
|
_urllib_robotparser_moved_attributes = [
|
||||||
|
MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
|
||||||
|
]
|
||||||
|
for attr in _urllib_robotparser_moved_attributes:
|
||||||
|
setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
|
||||||
|
del attr
|
||||||
|
|
||||||
|
Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
|
||||||
|
|
||||||
|
_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
|
||||||
|
"moves.urllib_robotparser", "moves.urllib.robotparser")
|
||||||
|
|
||||||
|
|
||||||
|
class Module_six_moves_urllib(types.ModuleType):
|
||||||
|
|
||||||
|
"""Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
|
||||||
|
__path__ = [] # mark as package
|
||||||
|
parse = _importer._get_module("moves.urllib_parse")
|
||||||
|
error = _importer._get_module("moves.urllib_error")
|
||||||
|
request = _importer._get_module("moves.urllib_request")
|
||||||
|
response = _importer._get_module("moves.urllib_response")
|
||||||
|
robotparser = _importer._get_module("moves.urllib_robotparser")
|
||||||
|
|
||||||
|
def __dir__(self):
|
||||||
|
return ['parse', 'error', 'request', 'response', 'robotparser']
|
||||||
|
|
||||||
|
_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
|
||||||
|
"moves.urllib")
|
||||||
|
|
||||||
|
|
||||||
|
def add_move(move):
|
||||||
|
"""Add an item to six.moves."""
|
||||||
|
setattr(_MovedItems, move.name, move)
|
||||||
|
|
||||||
|
|
||||||
|
def remove_move(name):
|
||||||
|
"""Remove item from six.moves."""
|
||||||
|
try:
|
||||||
|
delattr(_MovedItems, name)
|
||||||
|
except AttributeError:
|
||||||
|
try:
|
||||||
|
del moves.__dict__[name]
|
||||||
|
except KeyError:
|
||||||
|
raise AttributeError("no such move, %r" % (name,))
|
||||||
|
|
||||||
|
|
||||||
|
if PY3:
|
||||||
|
_meth_func = "__func__"
|
||||||
|
_meth_self = "__self__"
|
||||||
|
|
||||||
|
_func_closure = "__closure__"
|
||||||
|
_func_code = "__code__"
|
||||||
|
_func_defaults = "__defaults__"
|
||||||
|
_func_globals = "__globals__"
|
||||||
|
else:
|
||||||
|
_meth_func = "im_func"
|
||||||
|
_meth_self = "im_self"
|
||||||
|
|
||||||
|
_func_closure = "func_closure"
|
||||||
|
_func_code = "func_code"
|
||||||
|
_func_defaults = "func_defaults"
|
||||||
|
_func_globals = "func_globals"
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
advance_iterator = next
|
||||||
|
except NameError:
|
||||||
|
def advance_iterator(it):
|
||||||
|
return it.next()
|
||||||
|
next = advance_iterator
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
callable = callable
|
||||||
|
except NameError:
|
||||||
|
def callable(obj):
|
||||||
|
return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
|
||||||
|
|
||||||
|
|
||||||
|
if PY3:
|
||||||
|
def get_unbound_function(unbound):
|
||||||
|
return unbound
|
||||||
|
|
||||||
|
create_bound_method = types.MethodType
|
||||||
|
|
||||||
|
def create_unbound_method(func, cls):
|
||||||
|
return func
|
||||||
|
|
||||||
|
Iterator = object
|
||||||
|
else:
|
||||||
|
def get_unbound_function(unbound):
|
||||||
|
return unbound.im_func
|
||||||
|
|
||||||
|
def create_bound_method(func, obj):
|
||||||
|
return types.MethodType(func, obj, obj.__class__)
|
||||||
|
|
||||||
|
def create_unbound_method(func, cls):
|
||||||
|
return types.MethodType(func, None, cls)
|
||||||
|
|
||||||
|
class Iterator(object):
|
||||||
|
|
||||||
|
def next(self):
|
||||||
|
return type(self).__next__(self)
|
||||||
|
|
||||||
|
callable = callable
|
||||||
|
_add_doc(get_unbound_function,
|
||||||
|
"""Get the function out of a possibly unbound function""")
|
||||||
|
|
||||||
|
|
||||||
|
get_method_function = operator.attrgetter(_meth_func)
|
||||||
|
get_method_self = operator.attrgetter(_meth_self)
|
||||||
|
get_function_closure = operator.attrgetter(_func_closure)
|
||||||
|
get_function_code = operator.attrgetter(_func_code)
|
||||||
|
get_function_defaults = operator.attrgetter(_func_defaults)
|
||||||
|
get_function_globals = operator.attrgetter(_func_globals)
|
||||||
|
|
||||||
|
|
||||||
|
if PY3:
|
||||||
|
def iterkeys(d, **kw):
|
||||||
|
return iter(d.keys(**kw))
|
||||||
|
|
||||||
|
def itervalues(d, **kw):
|
||||||
|
return iter(d.values(**kw))
|
||||||
|
|
||||||
|
def iteritems(d, **kw):
|
||||||
|
return iter(d.items(**kw))
|
||||||
|
|
||||||
|
def iterlists(d, **kw):
|
||||||
|
return iter(d.lists(**kw))
|
||||||
|
|
||||||
|
viewkeys = operator.methodcaller("keys")
|
||||||
|
|
||||||
|
viewvalues = operator.methodcaller("values")
|
||||||
|
|
||||||
|
viewitems = operator.methodcaller("items")
|
||||||
|
else:
|
||||||
|
def iterkeys(d, **kw):
|
||||||
|
return d.iterkeys(**kw)
|
||||||
|
|
||||||
|
def itervalues(d, **kw):
|
||||||
|
return d.itervalues(**kw)
|
||||||
|
|
||||||
|
def iteritems(d, **kw):
|
||||||
|
return d.iteritems(**kw)
|
||||||
|
|
||||||
|
def iterlists(d, **kw):
|
||||||
|
return d.iterlists(**kw)
|
||||||
|
|
||||||
|
viewkeys = operator.methodcaller("viewkeys")
|
||||||
|
|
||||||
|
viewvalues = operator.methodcaller("viewvalues")
|
||||||
|
|
||||||
|
viewitems = operator.methodcaller("viewitems")
|
||||||
|
|
||||||
|
_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
|
||||||
|
_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
|
||||||
|
_add_doc(iteritems,
|
||||||
|
"Return an iterator over the (key, value) pairs of a dictionary.")
|
||||||
|
_add_doc(iterlists,
|
||||||
|
"Return an iterator over the (key, [values]) pairs of a dictionary.")
|
||||||
|
|
||||||
|
|
||||||
|
if PY3:
|
||||||
|
def b(s):
|
||||||
|
return s.encode("latin-1")
|
||||||
|
|
||||||
|
def u(s):
|
||||||
|
return s
|
||||||
|
unichr = chr
|
||||||
|
import struct
|
||||||
|
int2byte = struct.Struct(">B").pack
|
||||||
|
del struct
|
||||||
|
byte2int = operator.itemgetter(0)
|
||||||
|
indexbytes = operator.getitem
|
||||||
|
iterbytes = iter
|
||||||
|
import io
|
||||||
|
StringIO = io.StringIO
|
||||||
|
BytesIO = io.BytesIO
|
||||||
|
_assertCountEqual = "assertCountEqual"
|
||||||
|
if sys.version_info[1] <= 1:
|
||||||
|
_assertRaisesRegex = "assertRaisesRegexp"
|
||||||
|
_assertRegex = "assertRegexpMatches"
|
||||||
|
else:
|
||||||
|
_assertRaisesRegex = "assertRaisesRegex"
|
||||||
|
_assertRegex = "assertRegex"
|
||||||
|
else:
|
||||||
|
def b(s):
|
||||||
|
return s
|
||||||
|
# Workaround for standalone backslash
|
||||||
|
|
||||||
|
def u(s):
|
||||||
|
return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
|
||||||
|
unichr = unichr
|
||||||
|
int2byte = chr
|
||||||
|
|
||||||
|
def byte2int(bs):
|
||||||
|
return ord(bs[0])
|
||||||
|
|
||||||
|
def indexbytes(buf, i):
|
||||||
|
return ord(buf[i])
|
||||||
|
iterbytes = functools.partial(itertools.imap, ord)
|
||||||
|
import StringIO
|
||||||
|
StringIO = BytesIO = StringIO.StringIO
|
||||||
|
_assertCountEqual = "assertItemsEqual"
|
||||||
|
_assertRaisesRegex = "assertRaisesRegexp"
|
||||||
|
_assertRegex = "assertRegexpMatches"
|
||||||
|
_add_doc(b, """Byte literal""")
|
||||||
|
_add_doc(u, """Text literal""")
|
||||||
|
|
||||||
|
|
||||||
|
def assertCountEqual(self, *args, **kwargs):
|
||||||
|
return getattr(self, _assertCountEqual)(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
def assertRaisesRegex(self, *args, **kwargs):
|
||||||
|
return getattr(self, _assertRaisesRegex)(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
def assertRegex(self, *args, **kwargs):
|
||||||
|
return getattr(self, _assertRegex)(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
if PY3:
|
||||||
|
exec_ = getattr(moves.builtins, "exec")
|
||||||
|
|
||||||
|
def reraise(tp, value, tb=None):
|
||||||
|
if value is None:
|
||||||
|
value = tp()
|
||||||
|
if value.__traceback__ is not tb:
|
||||||
|
raise value.with_traceback(tb)
|
||||||
|
raise value
|
||||||
|
|
||||||
|
else:
|
||||||
|
def exec_(_code_, _globs_=None, _locs_=None):
|
||||||
|
"""Execute code in a namespace."""
|
||||||
|
if _globs_ is None:
|
||||||
|
frame = sys._getframe(1)
|
||||||
|
_globs_ = frame.f_globals
|
||||||
|
if _locs_ is None:
|
||||||
|
_locs_ = frame.f_locals
|
||||||
|
del frame
|
||||||
|
elif _locs_ is None:
|
||||||
|
_locs_ = _globs_
|
||||||
|
exec("""exec _code_ in _globs_, _locs_""")
|
||||||
|
|
||||||
|
exec_("""def reraise(tp, value, tb=None):
|
||||||
|
raise tp, value, tb
|
||||||
|
""")
|
||||||
|
|
||||||
|
|
||||||
|
if sys.version_info[:2] == (3, 2):
|
||||||
|
exec_("""def raise_from(value, from_value):
|
||||||
|
if from_value is None:
|
||||||
|
raise value
|
||||||
|
raise value from from_value
|
||||||
|
""")
|
||||||
|
elif sys.version_info[:2] > (3, 2):
|
||||||
|
exec_("""def raise_from(value, from_value):
|
||||||
|
raise value from from_value
|
||||||
|
""")
|
||||||
|
else:
|
||||||
|
def raise_from(value, from_value):
|
||||||
|
raise value
|
||||||
|
|
||||||
|
|
||||||
|
print_ = getattr(moves.builtins, "print", None)
|
||||||
|
if print_ is None:
|
||||||
|
def print_(*args, **kwargs):
|
||||||
|
"""The new-style print function for Python 2.4 and 2.5."""
|
||||||
|
fp = kwargs.pop("file", sys.stdout)
|
||||||
|
if fp is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
def write(data):
|
||||||
|
if not isinstance(data, basestring):
|
||||||
|
data = str(data)
|
||||||
|
# If the file has an encoding, encode unicode with it.
|
||||||
|
if (isinstance(fp, file) and
|
||||||
|
isinstance(data, unicode) and
|
||||||
|
fp.encoding is not None):
|
||||||
|
errors = getattr(fp, "errors", None)
|
||||||
|
if errors is None:
|
||||||
|
errors = "strict"
|
||||||
|
data = data.encode(fp.encoding, errors)
|
||||||
|
fp.write(data)
|
||||||
|
want_unicode = False
|
||||||
|
sep = kwargs.pop("sep", None)
|
||||||
|
if sep is not None:
|
||||||
|
if isinstance(sep, unicode):
|
||||||
|
want_unicode = True
|
||||||
|
elif not isinstance(sep, str):
|
||||||
|
raise TypeError("sep must be None or a string")
|
||||||
|
end = kwargs.pop("end", None)
|
||||||
|
if end is not None:
|
||||||
|
if isinstance(end, unicode):
|
||||||
|
want_unicode = True
|
||||||
|
elif not isinstance(end, str):
|
||||||
|
raise TypeError("end must be None or a string")
|
||||||
|
if kwargs:
|
||||||
|
raise TypeError("invalid keyword arguments to print()")
|
||||||
|
if not want_unicode:
|
||||||
|
for arg in args:
|
||||||
|
if isinstance(arg, unicode):
|
||||||
|
want_unicode = True
|
||||||
|
break
|
||||||
|
if want_unicode:
|
||||||
|
newline = unicode("\n")
|
||||||
|
space = unicode(" ")
|
||||||
|
else:
|
||||||
|
newline = "\n"
|
||||||
|
space = " "
|
||||||
|
if sep is None:
|
||||||
|
sep = space
|
||||||
|
if end is None:
|
||||||
|
end = newline
|
||||||
|
for i, arg in enumerate(args):
|
||||||
|
if i:
|
||||||
|
write(sep)
|
||||||
|
write(arg)
|
||||||
|
write(end)
|
||||||
|
if sys.version_info[:2] < (3, 3):
|
||||||
|
_print = print_
|
||||||
|
|
||||||
|
def print_(*args, **kwargs):
|
||||||
|
fp = kwargs.get("file", sys.stdout)
|
||||||
|
flush = kwargs.pop("flush", False)
|
||||||
|
_print(*args, **kwargs)
|
||||||
|
if flush and fp is not None:
|
||||||
|
fp.flush()
|
||||||
|
|
||||||
|
_add_doc(reraise, """Reraise an exception.""")
|
||||||
|
|
||||||
|
if sys.version_info[0:2] < (3, 4):
|
||||||
|
def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
|
||||||
|
updated=functools.WRAPPER_UPDATES):
|
||||||
|
def wrapper(f):
|
||||||
|
f = functools.wraps(wrapped, assigned, updated)(f)
|
||||||
|
f.__wrapped__ = wrapped
|
||||||
|
return f
|
||||||
|
return wrapper
|
||||||
|
else:
|
||||||
|
wraps = functools.wraps
|
||||||
|
|
||||||
|
|
||||||
|
def with_metaclass(meta, *bases):
|
||||||
|
"""Create a base class with a metaclass."""
|
||||||
|
# This requires a bit of explanation: the basic idea is to make a dummy
|
||||||
|
# metaclass for one level of class instantiation that replaces itself with
|
||||||
|
# the actual metaclass.
|
||||||
|
class metaclass(meta):
|
||||||
|
|
||||||
|
def __new__(cls, name, this_bases, d):
|
||||||
|
return meta(name, bases, d)
|
||||||
|
return type.__new__(metaclass, 'temporary_class', (), {})
|
||||||
|
|
||||||
|
|
||||||
|
def add_metaclass(metaclass):
|
||||||
|
"""Class decorator for creating a class with a metaclass."""
|
||||||
|
def wrapper(cls):
|
||||||
|
orig_vars = cls.__dict__.copy()
|
||||||
|
slots = orig_vars.get('__slots__')
|
||||||
|
if slots is not None:
|
||||||
|
if isinstance(slots, str):
|
||||||
|
slots = [slots]
|
||||||
|
for slots_var in slots:
|
||||||
|
orig_vars.pop(slots_var)
|
||||||
|
orig_vars.pop('__dict__', None)
|
||||||
|
orig_vars.pop('__weakref__', None)
|
||||||
|
return metaclass(cls.__name__, cls.__bases__, orig_vars)
|
||||||
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
|
def python_2_unicode_compatible(klass):
|
||||||
|
"""
|
||||||
|
A decorator that defines __unicode__ and __str__ methods under Python 2.
|
||||||
|
Under Python 3 it does nothing.
|
||||||
|
|
||||||
|
To support Python 2 and 3 with a single code base, define a __str__ method
|
||||||
|
returning text and apply this decorator to the class.
|
||||||
|
"""
|
||||||
|
if PY2:
|
||||||
|
if '__str__' not in klass.__dict__:
|
||||||
|
raise ValueError("@python_2_unicode_compatible cannot be applied "
|
||||||
|
"to %s because it doesn't define __str__()." %
|
||||||
|
klass.__name__)
|
||||||
|
klass.__unicode__ = klass.__str__
|
||||||
|
klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
|
||||||
|
return klass
|
||||||
|
|
||||||
|
|
||||||
|
# Complete the moves implementation.
|
||||||
|
# This code is at the end of this module to speed up module loading.
|
||||||
|
# Turn this module into a package.
|
||||||
|
__path__ = [] # required for PEP 302 and PEP 451
|
||||||
|
__package__ = __name__ # see PEP 366 @ReservedAssignment
|
||||||
|
if globals().get("__spec__") is not None:
|
||||||
|
__spec__.submodule_search_locations = [] # PEP 451 @UndefinedVariable
|
||||||
|
# Remove other six meta path importers, since they cause problems. This can
|
||||||
|
# happen if six is removed from sys.modules and then reloaded. (Setuptools does
|
||||||
|
# this for some reason.)
|
||||||
|
if sys.meta_path:
|
||||||
|
for i, importer in enumerate(sys.meta_path):
|
||||||
|
# Here's some real nastiness: Another "instance" of the six module might
|
||||||
|
# be floating around. Therefore, we can't use isinstance() to check for
|
||||||
|
# the six meta path importer, since the other six instance will have
|
||||||
|
# inserted an importer with different class.
|
||||||
|
if (type(importer).__name__ == "_SixMetaPathImporter" and
|
||||||
|
importer.name == __name__):
|
||||||
|
del sys.meta_path[i]
|
||||||
|
break
|
||||||
|
del i, importer
|
||||||
|
# Finally, add the importer to the meta path import hook.
|
||||||
|
sys.meta_path.append(_importer)
|
||||||
|
|
|
||||||
|
|
@ -1,867 +0,0 @@
|
||||||
"""Utilities for writing code that runs on Python 2 and 3"""
|
|
||||||
|
|
||||||
# Copyright (c) 2010-2015 Benjamin Peterson
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
# of this software and associated documentation files (the "Software"), to deal
|
|
||||||
# in the Software without restriction, including without limitation the rights
|
|
||||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
# copies of the Software, and to permit persons to whom the Software is
|
|
||||||
# furnished to do so, subject to the following conditions:
|
|
||||||
#
|
|
||||||
# The above copyright notice and this permission notice shall be included in all
|
|
||||||
# copies or substantial portions of the Software.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
# SOFTWARE.
|
|
||||||
|
|
||||||
from __future__ import absolute_import
|
|
||||||
|
|
||||||
import functools
|
|
||||||
import itertools
|
|
||||||
import operator
|
|
||||||
import sys
|
|
||||||
import types
|
|
||||||
|
|
||||||
__author__ = "Benjamin Peterson <benjamin@python.org>"
|
|
||||||
__version__ = "1.10.0"
|
|
||||||
|
|
||||||
|
|
||||||
# Useful for very coarse version differentiation.
|
|
||||||
PY2 = sys.version_info[0] == 2
|
|
||||||
PY3 = sys.version_info[0] == 3
|
|
||||||
PY34 = sys.version_info[0:2] >= (3, 4)
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
string_types = str,
|
|
||||||
integer_types = int,
|
|
||||||
class_types = type,
|
|
||||||
text_type = str
|
|
||||||
binary_type = bytes
|
|
||||||
MAXSIZE = sys.maxsize
|
|
||||||
else:
|
|
||||||
string_types = basestring,
|
|
||||||
integer_types = (int, long)
|
|
||||||
class_types = (type, types.ClassType)
|
|
||||||
text_type = unicode
|
|
||||||
binary_type = str
|
|
||||||
|
|
||||||
if sys.platform.startswith("java"):
|
|
||||||
# Jython always uses 32 bits.
|
|
||||||
MAXSIZE = int((1 << 31) - 1)
|
|
||||||
else:
|
|
||||||
# It's possible to have sizeof(long) != sizeof(Py_ssize_t).
|
|
||||||
class X(object):
|
|
||||||
|
|
||||||
def __len__(self):
|
|
||||||
return 1 << 31
|
|
||||||
try:
|
|
||||||
len(X())
|
|
||||||
except OverflowError:
|
|
||||||
# 32-bit
|
|
||||||
MAXSIZE = int((1 << 31) - 1)
|
|
||||||
else:
|
|
||||||
# 64-bit
|
|
||||||
MAXSIZE = int((1 << 63) - 1)
|
|
||||||
del X
|
|
||||||
|
|
||||||
|
|
||||||
def _add_doc(func, doc):
|
|
||||||
"""Add documentation to a function."""
|
|
||||||
func.__doc__ = doc
|
|
||||||
|
|
||||||
|
|
||||||
def _import_module(name):
|
|
||||||
"""Import module, returning the module after the last dot."""
|
|
||||||
__import__(name)
|
|
||||||
return sys.modules[name]
|
|
||||||
|
|
||||||
|
|
||||||
class _LazyDescr(object):
|
|
||||||
|
|
||||||
def __init__(self, name):
|
|
||||||
self.name = name
|
|
||||||
|
|
||||||
def __get__(self, obj, tp):
|
|
||||||
result = self._resolve()
|
|
||||||
setattr(obj, self.name, result) # Invokes __set__.
|
|
||||||
try:
|
|
||||||
# This is a bit ugly, but it avoids running this again by
|
|
||||||
# removing this descriptor.
|
|
||||||
delattr(obj.__class__, self.name)
|
|
||||||
except AttributeError:
|
|
||||||
pass
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
class MovedModule(_LazyDescr):
|
|
||||||
|
|
||||||
def __init__(self, name, old, new=None):
|
|
||||||
super(MovedModule, self).__init__(name)
|
|
||||||
if PY3:
|
|
||||||
if new is None:
|
|
||||||
new = name
|
|
||||||
self.mod = new
|
|
||||||
else:
|
|
||||||
self.mod = old
|
|
||||||
|
|
||||||
def _resolve(self):
|
|
||||||
return _import_module(self.mod)
|
|
||||||
|
|
||||||
def __getattr__(self, attr):
|
|
||||||
_module = self._resolve()
|
|
||||||
value = getattr(_module, attr)
|
|
||||||
setattr(self, attr, value)
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
class _LazyModule(types.ModuleType):
|
|
||||||
|
|
||||||
def __init__(self, name):
|
|
||||||
super(_LazyModule, self).__init__(name)
|
|
||||||
self.__doc__ = self.__class__.__doc__
|
|
||||||
|
|
||||||
def __dir__(self):
|
|
||||||
attrs = ["__doc__", "__name__"]
|
|
||||||
attrs += [attr.name for attr in self._moved_attributes]
|
|
||||||
return attrs
|
|
||||||
|
|
||||||
# Subclasses should override this
|
|
||||||
_moved_attributes = []
|
|
||||||
|
|
||||||
|
|
||||||
class MovedAttribute(_LazyDescr):
|
|
||||||
|
|
||||||
def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
|
|
||||||
super(MovedAttribute, self).__init__(name)
|
|
||||||
if PY3:
|
|
||||||
if new_mod is None:
|
|
||||||
new_mod = name
|
|
||||||
self.mod = new_mod
|
|
||||||
if new_attr is None:
|
|
||||||
if old_attr is None:
|
|
||||||
new_attr = name
|
|
||||||
else:
|
|
||||||
new_attr = old_attr
|
|
||||||
self.attr = new_attr
|
|
||||||
else:
|
|
||||||
self.mod = old_mod
|
|
||||||
if old_attr is None:
|
|
||||||
old_attr = name
|
|
||||||
self.attr = old_attr
|
|
||||||
|
|
||||||
def _resolve(self):
|
|
||||||
module = _import_module(self.mod)
|
|
||||||
return getattr(module, self.attr)
|
|
||||||
|
|
||||||
|
|
||||||
class _SixMetaPathImporter(object):
|
|
||||||
|
|
||||||
"""
|
|
||||||
A meta path importer to import six.moves and its submodules.
|
|
||||||
|
|
||||||
This class implements a PEP302 finder and loader. It should be compatible
|
|
||||||
with Python 2.5 and all existing versions of Python3
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, six_module_name):
|
|
||||||
self.name = six_module_name
|
|
||||||
self.known_modules = {}
|
|
||||||
|
|
||||||
def _add_module(self, mod, *fullnames):
|
|
||||||
for fullname in fullnames:
|
|
||||||
self.known_modules[self.name + "." + fullname] = mod
|
|
||||||
|
|
||||||
def _get_module(self, fullname):
|
|
||||||
return self.known_modules[self.name + "." + fullname]
|
|
||||||
|
|
||||||
def find_module(self, fullname, path=None):
|
|
||||||
if fullname in self.known_modules:
|
|
||||||
return self
|
|
||||||
return None
|
|
||||||
|
|
||||||
def __get_module(self, fullname):
|
|
||||||
try:
|
|
||||||
return self.known_modules[fullname]
|
|
||||||
except KeyError:
|
|
||||||
raise ImportError("This loader does not know module " + fullname)
|
|
||||||
|
|
||||||
def load_module(self, fullname):
|
|
||||||
try:
|
|
||||||
# in case of a reload
|
|
||||||
return sys.modules[fullname]
|
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
mod = self.__get_module(fullname)
|
|
||||||
if isinstance(mod, MovedModule):
|
|
||||||
mod = mod._resolve()
|
|
||||||
else:
|
|
||||||
mod.__loader__ = self
|
|
||||||
sys.modules[fullname] = mod
|
|
||||||
return mod
|
|
||||||
|
|
||||||
def is_package(self, fullname):
|
|
||||||
"""
|
|
||||||
Return true, if the named module is a package.
|
|
||||||
|
|
||||||
We need this method to get correct spec objects with
|
|
||||||
Python 3.4 (see PEP451)
|
|
||||||
"""
|
|
||||||
return hasattr(self.__get_module(fullname), "__path__")
|
|
||||||
|
|
||||||
def get_code(self, fullname):
|
|
||||||
"""Return None
|
|
||||||
|
|
||||||
Required, if is_package is implemented"""
|
|
||||||
self.__get_module(fullname) # eventually raises ImportError
|
|
||||||
return None
|
|
||||||
get_source = get_code # same as get_code
|
|
||||||
|
|
||||||
_importer = _SixMetaPathImporter(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class _MovedItems(_LazyModule):
|
|
||||||
|
|
||||||
"""Lazy loading of moved objects"""
|
|
||||||
__path__ = [] # mark as package
|
|
||||||
|
|
||||||
|
|
||||||
_moved_attributes = [
|
|
||||||
MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
|
|
||||||
MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
|
|
||||||
MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
|
|
||||||
MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
|
|
||||||
MovedAttribute("intern", "__builtin__", "sys"),
|
|
||||||
MovedAttribute("map", "itertools", "builtins", "imap", "map"),
|
|
||||||
MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
|
|
||||||
MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
|
|
||||||
MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
|
|
||||||
MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
|
|
||||||
MovedAttribute("reduce", "__builtin__", "functools"),
|
|
||||||
MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
|
|
||||||
MovedAttribute("StringIO", "StringIO", "io"),
|
|
||||||
MovedAttribute("UserDict", "UserDict", "collections"),
|
|
||||||
MovedAttribute("UserList", "UserList", "collections"),
|
|
||||||
MovedAttribute("UserString", "UserString", "collections"),
|
|
||||||
MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
|
|
||||||
MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
|
|
||||||
MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
|
|
||||||
MovedModule("builtins", "__builtin__"),
|
|
||||||
MovedModule("configparser", "ConfigParser"),
|
|
||||||
MovedModule("copyreg", "copy_reg"),
|
|
||||||
MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
|
|
||||||
MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
|
|
||||||
MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
|
|
||||||
MovedModule("http_cookies", "Cookie", "http.cookies"),
|
|
||||||
MovedModule("html_entities", "htmlentitydefs", "html.entities"),
|
|
||||||
MovedModule("html_parser", "HTMLParser", "html.parser"),
|
|
||||||
MovedModule("http_client", "httplib", "http.client"),
|
|
||||||
MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
|
|
||||||
MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
|
|
||||||
MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
|
|
||||||
MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
|
|
||||||
MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
|
|
||||||
MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
|
|
||||||
MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
|
|
||||||
MovedModule("cPickle", "cPickle", "pickle"),
|
|
||||||
MovedModule("queue", "Queue"),
|
|
||||||
MovedModule("reprlib", "repr"),
|
|
||||||
MovedModule("socketserver", "SocketServer"),
|
|
||||||
MovedModule("_thread", "thread", "_thread"),
|
|
||||||
MovedModule("tkinter", "Tkinter"),
|
|
||||||
MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
|
|
||||||
MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
|
|
||||||
MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
|
|
||||||
MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
|
|
||||||
MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
|
|
||||||
MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
|
|
||||||
MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
|
|
||||||
MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
|
|
||||||
MovedModule("tkinter_colorchooser", "tkColorChooser",
|
|
||||||
"tkinter.colorchooser"),
|
|
||||||
MovedModule("tkinter_commondialog", "tkCommonDialog",
|
|
||||||
"tkinter.commondialog"),
|
|
||||||
MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
|
|
||||||
MovedModule("tkinter_font", "tkFont", "tkinter.font"),
|
|
||||||
MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
|
|
||||||
MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
|
|
||||||
"tkinter.simpledialog"),
|
|
||||||
MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
|
|
||||||
MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
|
|
||||||
MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
|
|
||||||
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
|
|
||||||
MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
|
|
||||||
MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
|
|
||||||
]
|
|
||||||
# Add windows specific modules.
|
|
||||||
if sys.platform == "win32":
|
|
||||||
_moved_attributes += [
|
|
||||||
MovedModule("winreg", "_winreg"),
|
|
||||||
]
|
|
||||||
|
|
||||||
for attr in _moved_attributes:
|
|
||||||
setattr(_MovedItems, attr.name, attr)
|
|
||||||
if isinstance(attr, MovedModule):
|
|
||||||
_importer._add_module(attr, "moves." + attr.name)
|
|
||||||
del attr
|
|
||||||
|
|
||||||
_MovedItems._moved_attributes = _moved_attributes
|
|
||||||
|
|
||||||
moves = _MovedItems(__name__ + ".moves")
|
|
||||||
_importer._add_module(moves, "moves")
|
|
||||||
|
|
||||||
|
|
||||||
class Module_six_moves_urllib_parse(_LazyModule):
|
|
||||||
|
|
||||||
"""Lazy loading of moved objects in six.moves.urllib_parse"""
|
|
||||||
|
|
||||||
|
|
||||||
_urllib_parse_moved_attributes = [
|
|
||||||
MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("urljoin", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("urlparse", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("quote", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("quote_plus", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("unquote", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("urlencode", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("splitquery", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("splittag", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("splituser", "urllib", "urllib.parse"),
|
|
||||||
MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("uses_params", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("uses_query", "urlparse", "urllib.parse"),
|
|
||||||
MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
|
|
||||||
]
|
|
||||||
for attr in _urllib_parse_moved_attributes:
|
|
||||||
setattr(Module_six_moves_urllib_parse, attr.name, attr)
|
|
||||||
del attr
|
|
||||||
|
|
||||||
Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
|
|
||||||
|
|
||||||
_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
|
|
||||||
"moves.urllib_parse", "moves.urllib.parse")
|
|
||||||
|
|
||||||
|
|
||||||
class Module_six_moves_urllib_error(_LazyModule):
|
|
||||||
|
|
||||||
"""Lazy loading of moved objects in six.moves.urllib_error"""
|
|
||||||
|
|
||||||
|
|
||||||
_urllib_error_moved_attributes = [
|
|
||||||
MovedAttribute("URLError", "urllib2", "urllib.error"),
|
|
||||||
MovedAttribute("HTTPError", "urllib2", "urllib.error"),
|
|
||||||
MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
|
|
||||||
]
|
|
||||||
for attr in _urllib_error_moved_attributes:
|
|
||||||
setattr(Module_six_moves_urllib_error, attr.name, attr)
|
|
||||||
del attr
|
|
||||||
|
|
||||||
Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
|
|
||||||
|
|
||||||
_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
|
|
||||||
"moves.urllib_error", "moves.urllib.error")
|
|
||||||
|
|
||||||
|
|
||||||
class Module_six_moves_urllib_request(_LazyModule):
|
|
||||||
|
|
||||||
"""Lazy loading of moved objects in six.moves.urllib_request"""
|
|
||||||
|
|
||||||
|
|
||||||
_urllib_request_moved_attributes = [
|
|
||||||
MovedAttribute("urlopen", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("install_opener", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("build_opener", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("pathname2url", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("url2pathname", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("getproxies", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("Request", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("FileHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
|
|
||||||
MovedAttribute("urlretrieve", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("urlcleanup", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("URLopener", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
|
|
||||||
MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
|
|
||||||
]
|
|
||||||
for attr in _urllib_request_moved_attributes:
|
|
||||||
setattr(Module_six_moves_urllib_request, attr.name, attr)
|
|
||||||
del attr
|
|
||||||
|
|
||||||
Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
|
|
||||||
|
|
||||||
_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
|
|
||||||
"moves.urllib_request", "moves.urllib.request")
|
|
||||||
|
|
||||||
|
|
||||||
class Module_six_moves_urllib_response(_LazyModule):
|
|
||||||
|
|
||||||
"""Lazy loading of moved objects in six.moves.urllib_response"""
|
|
||||||
|
|
||||||
|
|
||||||
_urllib_response_moved_attributes = [
|
|
||||||
MovedAttribute("addbase", "urllib", "urllib.response"),
|
|
||||||
MovedAttribute("addclosehook", "urllib", "urllib.response"),
|
|
||||||
MovedAttribute("addinfo", "urllib", "urllib.response"),
|
|
||||||
MovedAttribute("addinfourl", "urllib", "urllib.response"),
|
|
||||||
]
|
|
||||||
for attr in _urllib_response_moved_attributes:
|
|
||||||
setattr(Module_six_moves_urllib_response, attr.name, attr)
|
|
||||||
del attr
|
|
||||||
|
|
||||||
Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
|
|
||||||
|
|
||||||
_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
|
|
||||||
"moves.urllib_response", "moves.urllib.response")
|
|
||||||
|
|
||||||
|
|
||||||
class Module_six_moves_urllib_robotparser(_LazyModule):
|
|
||||||
|
|
||||||
"""Lazy loading of moved objects in six.moves.urllib_robotparser"""
|
|
||||||
|
|
||||||
|
|
||||||
_urllib_robotparser_moved_attributes = [
|
|
||||||
MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
|
|
||||||
]
|
|
||||||
for attr in _urllib_robotparser_moved_attributes:
|
|
||||||
setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
|
|
||||||
del attr
|
|
||||||
|
|
||||||
Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
|
|
||||||
|
|
||||||
_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
|
|
||||||
"moves.urllib_robotparser", "moves.urllib.robotparser")
|
|
||||||
|
|
||||||
|
|
||||||
class Module_six_moves_urllib(types.ModuleType):
|
|
||||||
|
|
||||||
"""Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
|
|
||||||
__path__ = [] # mark as package
|
|
||||||
parse = _importer._get_module("moves.urllib_parse")
|
|
||||||
error = _importer._get_module("moves.urllib_error")
|
|
||||||
request = _importer._get_module("moves.urllib_request")
|
|
||||||
response = _importer._get_module("moves.urllib_response")
|
|
||||||
robotparser = _importer._get_module("moves.urllib_robotparser")
|
|
||||||
|
|
||||||
def __dir__(self):
|
|
||||||
return ['parse', 'error', 'request', 'response', 'robotparser']
|
|
||||||
|
|
||||||
_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
|
|
||||||
"moves.urllib")
|
|
||||||
|
|
||||||
|
|
||||||
def add_move(move):
|
|
||||||
"""Add an item to six.moves."""
|
|
||||||
setattr(_MovedItems, move.name, move)
|
|
||||||
|
|
||||||
|
|
||||||
def remove_move(name):
|
|
||||||
"""Remove item from six.moves."""
|
|
||||||
try:
|
|
||||||
delattr(_MovedItems, name)
|
|
||||||
except AttributeError:
|
|
||||||
try:
|
|
||||||
del moves.__dict__[name]
|
|
||||||
except KeyError:
|
|
||||||
raise AttributeError("no such move, %r" % (name,))
|
|
||||||
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
_meth_func = "__func__"
|
|
||||||
_meth_self = "__self__"
|
|
||||||
|
|
||||||
_func_closure = "__closure__"
|
|
||||||
_func_code = "__code__"
|
|
||||||
_func_defaults = "__defaults__"
|
|
||||||
_func_globals = "__globals__"
|
|
||||||
else:
|
|
||||||
_meth_func = "im_func"
|
|
||||||
_meth_self = "im_self"
|
|
||||||
|
|
||||||
_func_closure = "func_closure"
|
|
||||||
_func_code = "func_code"
|
|
||||||
_func_defaults = "func_defaults"
|
|
||||||
_func_globals = "func_globals"
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
advance_iterator = next
|
|
||||||
except NameError:
|
|
||||||
def advance_iterator(it):
|
|
||||||
return it.next()
|
|
||||||
next = advance_iterator
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
callable = callable
|
|
||||||
except NameError:
|
|
||||||
def callable(obj):
|
|
||||||
return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
|
|
||||||
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
def get_unbound_function(unbound):
|
|
||||||
return unbound
|
|
||||||
|
|
||||||
create_bound_method = types.MethodType
|
|
||||||
|
|
||||||
def create_unbound_method(func, cls):
|
|
||||||
return func
|
|
||||||
|
|
||||||
Iterator = object
|
|
||||||
else:
|
|
||||||
def get_unbound_function(unbound):
|
|
||||||
return unbound.im_func
|
|
||||||
|
|
||||||
def create_bound_method(func, obj):
|
|
||||||
return types.MethodType(func, obj, obj.__class__)
|
|
||||||
|
|
||||||
def create_unbound_method(func, cls):
|
|
||||||
return types.MethodType(func, None, cls)
|
|
||||||
|
|
||||||
class Iterator(object):
|
|
||||||
|
|
||||||
def next(self):
|
|
||||||
return type(self).__next__(self)
|
|
||||||
|
|
||||||
callable = callable
|
|
||||||
_add_doc(get_unbound_function,
|
|
||||||
"""Get the function out of a possibly unbound function""")
|
|
||||||
|
|
||||||
|
|
||||||
get_method_function = operator.attrgetter(_meth_func)
|
|
||||||
get_method_self = operator.attrgetter(_meth_self)
|
|
||||||
get_function_closure = operator.attrgetter(_func_closure)
|
|
||||||
get_function_code = operator.attrgetter(_func_code)
|
|
||||||
get_function_defaults = operator.attrgetter(_func_defaults)
|
|
||||||
get_function_globals = operator.attrgetter(_func_globals)
|
|
||||||
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
def iterkeys(d, **kw):
|
|
||||||
return iter(d.keys(**kw))
|
|
||||||
|
|
||||||
def itervalues(d, **kw):
|
|
||||||
return iter(d.values(**kw))
|
|
||||||
|
|
||||||
def iteritems(d, **kw):
|
|
||||||
return iter(d.items(**kw))
|
|
||||||
|
|
||||||
def iterlists(d, **kw):
|
|
||||||
return iter(d.lists(**kw))
|
|
||||||
|
|
||||||
viewkeys = operator.methodcaller("keys")
|
|
||||||
|
|
||||||
viewvalues = operator.methodcaller("values")
|
|
||||||
|
|
||||||
viewitems = operator.methodcaller("items")
|
|
||||||
else:
|
|
||||||
def iterkeys(d, **kw):
|
|
||||||
return d.iterkeys(**kw)
|
|
||||||
|
|
||||||
def itervalues(d, **kw):
|
|
||||||
return d.itervalues(**kw)
|
|
||||||
|
|
||||||
def iteritems(d, **kw):
|
|
||||||
return d.iteritems(**kw)
|
|
||||||
|
|
||||||
def iterlists(d, **kw):
|
|
||||||
return d.iterlists(**kw)
|
|
||||||
|
|
||||||
viewkeys = operator.methodcaller("viewkeys")
|
|
||||||
|
|
||||||
viewvalues = operator.methodcaller("viewvalues")
|
|
||||||
|
|
||||||
viewitems = operator.methodcaller("viewitems")
|
|
||||||
|
|
||||||
_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
|
|
||||||
_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
|
|
||||||
_add_doc(iteritems,
|
|
||||||
"Return an iterator over the (key, value) pairs of a dictionary.")
|
|
||||||
_add_doc(iterlists,
|
|
||||||
"Return an iterator over the (key, [values]) pairs of a dictionary.")
|
|
||||||
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
def b(s):
|
|
||||||
return s.encode("latin-1")
|
|
||||||
|
|
||||||
def u(s):
|
|
||||||
return s
|
|
||||||
unichr = chr
|
|
||||||
import struct
|
|
||||||
int2byte = struct.Struct(">B").pack
|
|
||||||
del struct
|
|
||||||
byte2int = operator.itemgetter(0)
|
|
||||||
indexbytes = operator.getitem
|
|
||||||
iterbytes = iter
|
|
||||||
import io
|
|
||||||
StringIO = io.StringIO
|
|
||||||
BytesIO = io.BytesIO
|
|
||||||
_assertCountEqual = "assertCountEqual"
|
|
||||||
if sys.version_info[1] <= 1:
|
|
||||||
_assertRaisesRegex = "assertRaisesRegexp"
|
|
||||||
_assertRegex = "assertRegexpMatches"
|
|
||||||
else:
|
|
||||||
_assertRaisesRegex = "assertRaisesRegex"
|
|
||||||
_assertRegex = "assertRegex"
|
|
||||||
else:
|
|
||||||
def b(s):
|
|
||||||
return s
|
|
||||||
# Workaround for standalone backslash
|
|
||||||
|
|
||||||
def u(s):
|
|
||||||
return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
|
|
||||||
unichr = unichr
|
|
||||||
int2byte = chr
|
|
||||||
|
|
||||||
def byte2int(bs):
|
|
||||||
return ord(bs[0])
|
|
||||||
|
|
||||||
def indexbytes(buf, i):
|
|
||||||
return ord(buf[i])
|
|
||||||
iterbytes = functools.partial(itertools.imap, ord)
|
|
||||||
import StringIO
|
|
||||||
StringIO = BytesIO = StringIO.StringIO
|
|
||||||
_assertCountEqual = "assertItemsEqual"
|
|
||||||
_assertRaisesRegex = "assertRaisesRegexp"
|
|
||||||
_assertRegex = "assertRegexpMatches"
|
|
||||||
_add_doc(b, """Byte literal""")
|
|
||||||
_add_doc(u, """Text literal""")
|
|
||||||
|
|
||||||
|
|
||||||
def assertCountEqual(self, *args, **kwargs):
|
|
||||||
return getattr(self, _assertCountEqual)(*args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
def assertRaisesRegex(self, *args, **kwargs):
|
|
||||||
return getattr(self, _assertRaisesRegex)(*args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
def assertRegex(self, *args, **kwargs):
|
|
||||||
return getattr(self, _assertRegex)(*args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
exec_ = getattr(moves.builtins, "exec")
|
|
||||||
|
|
||||||
def reraise(tp, value, tb=None):
|
|
||||||
if value is None:
|
|
||||||
value = tp()
|
|
||||||
if value.__traceback__ is not tb:
|
|
||||||
raise value.with_traceback(tb)
|
|
||||||
raise value
|
|
||||||
|
|
||||||
else:
|
|
||||||
def exec_(_code_, _globs_=None, _locs_=None):
|
|
||||||
"""Execute code in a namespace."""
|
|
||||||
if _globs_ is None:
|
|
||||||
frame = sys._getframe(1)
|
|
||||||
_globs_ = frame.f_globals
|
|
||||||
if _locs_ is None:
|
|
||||||
_locs_ = frame.f_locals
|
|
||||||
del frame
|
|
||||||
elif _locs_ is None:
|
|
||||||
_locs_ = _globs_
|
|
||||||
exec("""exec _code_ in _globs_, _locs_""")
|
|
||||||
|
|
||||||
exec_("""def reraise(tp, value, tb=None):
|
|
||||||
raise tp, value, tb
|
|
||||||
""")
|
|
||||||
|
|
||||||
|
|
||||||
if sys.version_info[:2] == (3, 2):
|
|
||||||
exec_("""def raise_from(value, from_value):
|
|
||||||
if from_value is None:
|
|
||||||
raise value
|
|
||||||
raise value from from_value
|
|
||||||
""")
|
|
||||||
elif sys.version_info[:2] > (3, 2):
|
|
||||||
exec_("""def raise_from(value, from_value):
|
|
||||||
raise value from from_value
|
|
||||||
""")
|
|
||||||
else:
|
|
||||||
def raise_from(value, from_value):
|
|
||||||
raise value
|
|
||||||
|
|
||||||
|
|
||||||
print_ = getattr(moves.builtins, "print", None)
|
|
||||||
if print_ is None:
|
|
||||||
def print_(*args, **kwargs):
|
|
||||||
"""The new-style print function for Python 2.4 and 2.5."""
|
|
||||||
fp = kwargs.pop("file", sys.stdout)
|
|
||||||
if fp is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
def write(data):
|
|
||||||
if not isinstance(data, basestring):
|
|
||||||
data = str(data)
|
|
||||||
# If the file has an encoding, encode unicode with it.
|
|
||||||
if (isinstance(fp, file) and
|
|
||||||
isinstance(data, unicode) and
|
|
||||||
fp.encoding is not None):
|
|
||||||
errors = getattr(fp, "errors", None)
|
|
||||||
if errors is None:
|
|
||||||
errors = "strict"
|
|
||||||
data = data.encode(fp.encoding, errors)
|
|
||||||
fp.write(data)
|
|
||||||
want_unicode = False
|
|
||||||
sep = kwargs.pop("sep", None)
|
|
||||||
if sep is not None:
|
|
||||||
if isinstance(sep, unicode):
|
|
||||||
want_unicode = True
|
|
||||||
elif not isinstance(sep, str):
|
|
||||||
raise TypeError("sep must be None or a string")
|
|
||||||
end = kwargs.pop("end", None)
|
|
||||||
if end is not None:
|
|
||||||
if isinstance(end, unicode):
|
|
||||||
want_unicode = True
|
|
||||||
elif not isinstance(end, str):
|
|
||||||
raise TypeError("end must be None or a string")
|
|
||||||
if kwargs:
|
|
||||||
raise TypeError("invalid keyword arguments to print()")
|
|
||||||
if not want_unicode:
|
|
||||||
for arg in args:
|
|
||||||
if isinstance(arg, unicode):
|
|
||||||
want_unicode = True
|
|
||||||
break
|
|
||||||
if want_unicode:
|
|
||||||
newline = unicode("\n")
|
|
||||||
space = unicode(" ")
|
|
||||||
else:
|
|
||||||
newline = "\n"
|
|
||||||
space = " "
|
|
||||||
if sep is None:
|
|
||||||
sep = space
|
|
||||||
if end is None:
|
|
||||||
end = newline
|
|
||||||
for i, arg in enumerate(args):
|
|
||||||
if i:
|
|
||||||
write(sep)
|
|
||||||
write(arg)
|
|
||||||
write(end)
|
|
||||||
if sys.version_info[:2] < (3, 3):
|
|
||||||
_print = print_
|
|
||||||
|
|
||||||
def print_(*args, **kwargs):
|
|
||||||
fp = kwargs.get("file", sys.stdout)
|
|
||||||
flush = kwargs.pop("flush", False)
|
|
||||||
_print(*args, **kwargs)
|
|
||||||
if flush and fp is not None:
|
|
||||||
fp.flush()
|
|
||||||
|
|
||||||
_add_doc(reraise, """Reraise an exception.""")
|
|
||||||
|
|
||||||
if sys.version_info[0:2] < (3, 4):
|
|
||||||
def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
|
|
||||||
updated=functools.WRAPPER_UPDATES):
|
|
||||||
def wrapper(f):
|
|
||||||
f = functools.wraps(wrapped, assigned, updated)(f)
|
|
||||||
f.__wrapped__ = wrapped
|
|
||||||
return f
|
|
||||||
return wrapper
|
|
||||||
else:
|
|
||||||
wraps = functools.wraps
|
|
||||||
|
|
||||||
|
|
||||||
def with_metaclass(meta, *bases):
|
|
||||||
"""Create a base class with a metaclass."""
|
|
||||||
# This requires a bit of explanation: the basic idea is to make a dummy
|
|
||||||
# metaclass for one level of class instantiation that replaces itself with
|
|
||||||
# the actual metaclass.
|
|
||||||
class metaclass(meta):
|
|
||||||
|
|
||||||
def __new__(cls, name, this_bases, d):
|
|
||||||
return meta(name, bases, d)
|
|
||||||
return type.__new__(metaclass, 'temporary_class', (), {})
|
|
||||||
|
|
||||||
|
|
||||||
def add_metaclass(metaclass):
|
|
||||||
"""Class decorator for creating a class with a metaclass."""
|
|
||||||
def wrapper(cls):
|
|
||||||
orig_vars = cls.__dict__.copy()
|
|
||||||
slots = orig_vars.get('__slots__')
|
|
||||||
if slots is not None:
|
|
||||||
if isinstance(slots, str):
|
|
||||||
slots = [slots]
|
|
||||||
for slots_var in slots:
|
|
||||||
orig_vars.pop(slots_var)
|
|
||||||
orig_vars.pop('__dict__', None)
|
|
||||||
orig_vars.pop('__weakref__', None)
|
|
||||||
return metaclass(cls.__name__, cls.__bases__, orig_vars)
|
|
||||||
return wrapper
|
|
||||||
|
|
||||||
|
|
||||||
def python_2_unicode_compatible(klass):
|
|
||||||
"""
|
|
||||||
A decorator that defines __unicode__ and __str__ methods under Python 2.
|
|
||||||
Under Python 3 it does nothing.
|
|
||||||
|
|
||||||
To support Python 2 and 3 with a single code base, define a __str__ method
|
|
||||||
returning text and apply this decorator to the class.
|
|
||||||
"""
|
|
||||||
if PY2:
|
|
||||||
if '__str__' not in klass.__dict__:
|
|
||||||
raise ValueError("@python_2_unicode_compatible cannot be applied "
|
|
||||||
"to %s because it doesn't define __str__()." %
|
|
||||||
klass.__name__)
|
|
||||||
klass.__unicode__ = klass.__str__
|
|
||||||
klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
|
|
||||||
return klass
|
|
||||||
|
|
||||||
|
|
||||||
# Complete the moves implementation.
|
|
||||||
# This code is at the end of this module to speed up module loading.
|
|
||||||
# Turn this module into a package.
|
|
||||||
__path__ = [] # required for PEP 302 and PEP 451
|
|
||||||
__package__ = __name__ # see PEP 366 @ReservedAssignment
|
|
||||||
if globals().get("__spec__") is not None:
|
|
||||||
__spec__.submodule_search_locations = [] # PEP 451 @UndefinedVariable
|
|
||||||
# Remove other six meta path importers, since they cause problems. This can
|
|
||||||
# happen if six is removed from sys.modules and then reloaded. (Setuptools does
|
|
||||||
# this for some reason.)
|
|
||||||
if sys.meta_path:
|
|
||||||
for i, importer in enumerate(sys.meta_path):
|
|
||||||
# Here's some real nastiness: Another "instance" of the six module might
|
|
||||||
# be floating around. Therefore, we can't use isinstance() to check for
|
|
||||||
# the six meta path importer, since the other six instance will have
|
|
||||||
# inserted an importer with different class.
|
|
||||||
if (type(importer).__name__ == "_SixMetaPathImporter" and
|
|
||||||
importer.name == __name__):
|
|
||||||
del sys.meta_path[i]
|
|
||||||
break
|
|
||||||
del i, importer
|
|
||||||
# Finally, add the importer to the meta path import hook.
|
|
||||||
sys.meta_path.append(_importer)
|
|
||||||
|
|
@ -296,7 +296,7 @@ def get_target_from_rule(module, ec2, rule, name, group, groups, vpc_id):
|
||||||
elif 'group_id' in rule and re.match(FOREIGN_SECURITY_GROUP_REGEX, rule['group_id']):
|
elif 'group_id' in rule and re.match(FOREIGN_SECURITY_GROUP_REGEX, rule['group_id']):
|
||||||
# this is a foreign Security Group. Since you can't fetch it you must create an instance of it
|
# this is a foreign Security Group. Since you can't fetch it you must create an instance of it
|
||||||
owner_id, group_id, group_name = re.match(FOREIGN_SECURITY_GROUP_REGEX, rule['group_id']).groups()
|
owner_id, group_id, group_name = re.match(FOREIGN_SECURITY_GROUP_REGEX, rule['group_id']).groups()
|
||||||
group_instance = SecurityGroup(owner_id=owner_id, group_name=group_name, id=group_id)
|
group_instance = ec2.SecurityGroup(owner_id=owner_id, group_name=group_name, id=group_id)
|
||||||
groups[group_id] = group_instance
|
groups[group_id] = group_instance
|
||||||
groups[group_name] = group_instance
|
groups[group_name] = group_instance
|
||||||
elif 'group_id' in rule:
|
elif 'group_id' in rule:
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,8 @@ EXAMPLES = '''
|
||||||
# fix this
|
# fix this
|
||||||
RETURN = '''# '''
|
RETURN = '''# '''
|
||||||
|
|
||||||
|
import traceback
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import boto.ec2
|
import boto.ec2
|
||||||
from boto.exception import BotoServerError
|
from boto.exception import BotoServerError
|
||||||
|
|
@ -74,6 +76,7 @@ except ImportError:
|
||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.ec2 import connect_to_aws, ec2_argument_spec, get_aws_connection_info
|
from ansible.module_utils.ec2 import connect_to_aws, ec2_argument_spec, get_aws_connection_info
|
||||||
|
from ansible.module_utils._text import to_native
|
||||||
|
|
||||||
|
|
||||||
def get_volume_info(volume):
|
def get_volume_info(volume):
|
||||||
|
|
@ -136,8 +139,8 @@ def main():
|
||||||
if region:
|
if region:
|
||||||
try:
|
try:
|
||||||
connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
|
connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
|
||||||
except (boto.exception.NoAuthHandlerFound, StandardError) as e:
|
except (boto.exception.NoAuthHandlerFound, Exception) as e:
|
||||||
module.fail_json(msg=str(e))
|
module.fail_json(msg=to_native(e), exception=traceback.format_exc())
|
||||||
else:
|
else:
|
||||||
module.fail_json(msg="region must be specified")
|
module.fail_json(msg="region must be specified")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -318,7 +318,7 @@ class EcsServiceManager:
|
||||||
c = self.find_in_array(response['services'], service_name)
|
c = self.find_in_array(response['services'], service_name)
|
||||||
if c:
|
if c:
|
||||||
return c
|
return c
|
||||||
raise StandardError("Unknown problem describing service %s." % service_name)
|
raise Exception("Unknown problem describing service %s." % service_name)
|
||||||
|
|
||||||
def is_matching_service(self, expected, existing):
|
def is_matching_service(self, expected, existing):
|
||||||
if expected['task_definition'] != existing['taskDefinition']:
|
if expected['task_definition'] != existing['taskDefinition']:
|
||||||
|
|
|
||||||
|
|
@ -341,14 +341,15 @@ vpc_id:
|
||||||
type: string
|
type: string
|
||||||
sample: vpc-0011223344
|
sample: vpc-0011223344
|
||||||
'''
|
'''
|
||||||
|
import time
|
||||||
|
import collections
|
||||||
|
from copy import deepcopy
|
||||||
|
import traceback
|
||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.six import string_types
|
from ansible.module_utils.six import string_types
|
||||||
from ansible.module_utils.ec2 import boto3_conn, get_aws_connection_info, camel_dict_to_snake_dict, ec2_argument_spec, get_ec2_security_group_ids_from_names, \
|
from ansible.module_utils.ec2 import boto3_conn, get_aws_connection_info, camel_dict_to_snake_dict, ec2_argument_spec, get_ec2_security_group_ids_from_names, \
|
||||||
ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict, compare_aws_tags, HAS_BOTO3
|
ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict, compare_aws_tags, HAS_BOTO3
|
||||||
import collections
|
|
||||||
from copy import deepcopy
|
|
||||||
import traceback
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import boto3
|
import boto3
|
||||||
|
|
|
||||||
|
|
@ -413,6 +413,7 @@ from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.ec2 import ec2_argument_spec, connect_to_aws, AnsibleAWSError
|
from ansible.module_utils.ec2 import ec2_argument_spec, connect_to_aws, AnsibleAWSError
|
||||||
from ansible.module_utils.ec2 import get_aws_connection_info
|
from ansible.module_utils.ec2 import get_aws_connection_info
|
||||||
from ansible.module_utils.six import string_types
|
from ansible.module_utils.six import string_types
|
||||||
|
from ansible.module_utils._text import to_native
|
||||||
|
|
||||||
|
|
||||||
def _throttleable_operation(max_retries):
|
def _throttleable_operation(max_retries):
|
||||||
|
|
@ -654,7 +655,7 @@ class ElbManager(object):
|
||||||
for x in range(0, max_retries):
|
for x in range(0, max_retries):
|
||||||
try:
|
try:
|
||||||
self.elb_conn.get_all_lb_attributes(self.name)
|
self.elb_conn.get_all_lb_attributes(self.name)
|
||||||
except (boto.exception.BotoServerError, StandardError) as e:
|
except (boto.exception.BotoServerError, Exception) as e:
|
||||||
if "LoadBalancerNotFound" in e.code:
|
if "LoadBalancerNotFound" in e.code:
|
||||||
status_achieved = True
|
status_achieved = True
|
||||||
break
|
break
|
||||||
|
|
@ -682,12 +683,12 @@ class ElbManager(object):
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
time.sleep(polling_increment_secs)
|
time.sleep(polling_increment_secs)
|
||||||
except (boto.exception.BotoServerError, StandardError) as e:
|
except (boto.exception.BotoServerError, Exception) as e:
|
||||||
if 'InvalidNetworkInterfaceID' in e.code:
|
if 'InvalidNetworkInterfaceID' in e.code:
|
||||||
status_achieved = True
|
status_achieved = True
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
self.module.fail_json(msg=str(e))
|
self.module.fail_json(msg=to_native(e), exception=traceback.format_exc())
|
||||||
|
|
||||||
return status_achieved
|
return status_achieved
|
||||||
|
|
||||||
|
|
@ -710,8 +711,8 @@ class ElbManager(object):
|
||||||
try:
|
try:
|
||||||
return connect_to_aws(boto.ec2, self.region,
|
return connect_to_aws(boto.ec2, self.region,
|
||||||
**self.aws_connect_params)
|
**self.aws_connect_params)
|
||||||
except (boto.exception.NoAuthHandlerFound, StandardError) as e:
|
except (boto.exception.NoAuthHandlerFound, Exception) as e:
|
||||||
self.module.fail_json(msg=str(e))
|
self.module.fail_json(msg=to_native(e), exception=traceback.format_exc())
|
||||||
|
|
||||||
@_throttleable_operation(_THROTTLING_RETRIES)
|
@_throttleable_operation(_THROTTLING_RETRIES)
|
||||||
def _delete_elb(self):
|
def _delete_elb(self):
|
||||||
|
|
|
||||||
|
|
@ -466,6 +466,7 @@ def command_sanity_pylint(args, targets):
|
||||||
'--reports', 'n',
|
'--reports', 'n',
|
||||||
'--max-line-length', '160',
|
'--max-line-length', '160',
|
||||||
'--rcfile', '/dev/null',
|
'--rcfile', '/dev/null',
|
||||||
|
'--ignored-modules', '_MovedItems',
|
||||||
'--output-format', 'json',
|
'--output-format', 'json',
|
||||||
'--disable', ','.join(sorted(disable)),
|
'--disable', ','.join(sorted(disable)),
|
||||||
] + paths
|
] + paths
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,7 @@ BASESTRING_USERS=$(grep -r basestring . \
|
||||||
-e test/results/ \
|
-e test/results/ \
|
||||||
-e docs/docsite/_build/ \
|
-e docs/docsite/_build/ \
|
||||||
-e docs/docsite/rst/dev_guide/testing/sanity/ \
|
-e docs/docsite/rst/dev_guide/testing/sanity/ \
|
||||||
-e lib/ansible/module_utils/six/_six.py \
|
-e lib/ansible/module_utils/six/__init__.py \
|
||||||
-e lib/ansible/modules/ \
|
|
||||||
-e '^[^:]*:#'
|
-e '^[^:]*:#'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ ITERITEMS_USERS=$(grep -rI '\.iteritems' . \
|
||||||
--exclude-dir docsite \
|
--exclude-dir docsite \
|
||||||
| grep -v \
|
| grep -v \
|
||||||
-e 'six\.iteritems' \
|
-e 'six\.iteritems' \
|
||||||
-e lib/ansible/module_utils/six/_six.py \
|
-e lib/ansible/module_utils/six/__init__.py \
|
||||||
-e test/sanity/code-smell/no-dict-iteritems.sh \
|
-e test/sanity/code-smell/no-dict-iteritems.sh \
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ ITERKEYS_USERS=$(grep -r -I iterkeys . \
|
||||||
| grep -v \
|
| grep -v \
|
||||||
-e 'metadata-.*.json:' \
|
-e 'metadata-.*.json:' \
|
||||||
-e lib/ansible.egg-info/ \
|
-e lib/ansible.egg-info/ \
|
||||||
-e lib/ansible/module_utils/six/_six.py \
|
-e lib/ansible/module_utils/six/__init__.py \
|
||||||
-e docs/docsite/rst/dev_guide/testing/sanity/ \
|
-e docs/docsite/rst/dev_guide/testing/sanity/ \
|
||||||
-e test/sanity/code-smell/no-dict-iterkeys.sh \
|
-e test/sanity/code-smell/no-dict-iterkeys.sh \
|
||||||
-e '^[^:]*:#'
|
-e '^[^:]*:#'
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ ITERVALUES_USERS=$(grep -rI '\.itervalues' . \
|
||||||
--exclude-dir docsite \
|
--exclude-dir docsite \
|
||||||
| grep -v \
|
| grep -v \
|
||||||
-e 'six\.itervalues' \
|
-e 'six\.itervalues' \
|
||||||
-e lib/ansible/module_utils/six/_six.py \
|
-e lib/ansible/module_utils/six/__init__.py \
|
||||||
-e test/sanity/code-smell/no-dict-itervalues.sh \
|
-e test/sanity/code-smell/no-dict-itervalues.sh \
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
urllib_users=$(find . -name '*.py' -exec grep -H urlopen '{}' '+' | grep -v \
|
urllib_users=$(find . -name '*.py' -exec grep -H urlopen '{}' '+' | grep -v \
|
||||||
-e '^[^:]*/.tox/' \
|
-e '^[^:]*/.tox/' \
|
||||||
-e '^\./lib/ansible/module_utils/urls.py:' \
|
-e '^\./lib/ansible/module_utils/urls.py:' \
|
||||||
-e '^\./lib/ansible/module_utils/six/_six.py:' \
|
-e '^\./lib/ansible/module_utils/six/__init__.py:' \
|
||||||
-e '^[^:]*:#'
|
-e '^[^:]*:#'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,9 @@ locally-disabled
|
||||||
locally-enabled
|
locally-enabled
|
||||||
method-hidden
|
method-hidden
|
||||||
no-member
|
no-member
|
||||||
no-name-in-module
|
|
||||||
no-value-for-parameter
|
no-value-for-parameter
|
||||||
non-iterator-returned
|
non-iterator-returned
|
||||||
|
no-name-in-module
|
||||||
not-a-mapping
|
not-a-mapping
|
||||||
not-an-iterable
|
not-an-iterable
|
||||||
not-callable
|
not-callable
|
||||||
|
|
|
||||||
|
|
@ -113,22 +113,22 @@ class TestRecursiveFinder(object):
|
||||||
name = 'ping'
|
name = 'ping'
|
||||||
data = b'#!/usr/bin/python\nfrom ansible.module_utils import six'
|
data = b'#!/usr/bin/python\nfrom ansible.module_utils import six'
|
||||||
recursive_finder(name, data, *finder_containers)
|
recursive_finder(name, data, *finder_containers)
|
||||||
assert finder_containers.py_module_names == set((('six', '__init__'), ('six', '_six')))
|
assert finder_containers.py_module_names == set((('six', '__init__'),))
|
||||||
assert finder_containers.py_module_cache == {}
|
assert finder_containers.py_module_cache == {}
|
||||||
assert frozenset(finder_containers.zf.namelist()) == frozenset(('ansible/module_utils/six/__init__.py', 'ansible/module_utils/six/_six.py'))
|
assert frozenset(finder_containers.zf.namelist()) == frozenset(('ansible/module_utils/six/__init__.py', ))
|
||||||
|
|
||||||
def test_import_six(self, finder_containers):
|
def test_import_six(self, finder_containers):
|
||||||
name = 'ping'
|
name = 'ping'
|
||||||
data = b'#!/usr/bin/python\nimport ansible.module_utils.six'
|
data = b'#!/usr/bin/python\nimport ansible.module_utils.six'
|
||||||
recursive_finder(name, data, *finder_containers)
|
recursive_finder(name, data, *finder_containers)
|
||||||
assert finder_containers.py_module_names == set((('six', '__init__'), ('six', '_six')))
|
assert finder_containers.py_module_names == set((('six', '__init__'),))
|
||||||
assert finder_containers.py_module_cache == {}
|
assert finder_containers.py_module_cache == {}
|
||||||
assert frozenset(finder_containers.zf.namelist()) == frozenset(('ansible/module_utils/six/__init__.py', 'ansible/module_utils/six/_six.py'))
|
assert frozenset(finder_containers.zf.namelist()) == frozenset(('ansible/module_utils/six/__init__.py', ))
|
||||||
|
|
||||||
def test_import_six_from_many_submodules(self, finder_containers):
|
def test_import_six_from_many_submodules(self, finder_containers):
|
||||||
name = 'ping'
|
name = 'ping'
|
||||||
data = b'#!/usr/bin/python\nfrom ansible.module_utils.six.moves.urllib.parse import urlparse'
|
data = b'#!/usr/bin/python\nfrom ansible.module_utils.six.moves.urllib.parse import urlparse'
|
||||||
recursive_finder(name, data, *finder_containers)
|
recursive_finder(name, data, *finder_containers)
|
||||||
assert finder_containers.py_module_names == set((('six', '__init__'), ('six', '_six')))
|
assert finder_containers.py_module_names == set((('six', '__init__'),))
|
||||||
assert finder_containers.py_module_cache == {}
|
assert finder_containers.py_module_cache == {}
|
||||||
assert frozenset(finder_containers.zf.namelist()) == frozenset(('ansible/module_utils/six/__init__.py', 'ansible/module_utils/six/_six.py'))
|
assert frozenset(finder_containers.zf.namelist()) == frozenset(('ansible/module_utils/six/__init__.py',))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue