third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/six.py - Issue 2476653002: wptserve: Import the latest revision of wptserve-related files.

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/six.py

Issue 2476653002: wptserve: Import the latest revision of wptserve-related files. (Closed)

Patch Set: Add six Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/README ('k') | third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/handlers.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/six.py

diff --git a/third_party/protobuf/third_party/six/six.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/six.py

similarity index 90%

copy from third_party/protobuf/third_party/six/six.py

copy to third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/six.py

index 190c0239cd7d7af82a6e0cbc8d68053fa2e3dfaf..686c20a15a6b28e05546d97fc2101b24cde6fe7f 100644

--- a/third_party/protobuf/third_party/six/six.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/six.py

@@ -1,6 +1,6 @@

"""Utilities for writing code that runs on Python 2 and 3"""

# Permission is hereby granted, free of charge, to any person obtaining a copy

# of this software and associated documentation files (the "Software"), to deal

@@ -29,13 +29,12 @@ import sys

import types

__author__ = "Benjamin Peterson <benjamin@python.org>"

-__version__ = "1.10.0"

+__version__ = "1.8.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,

@@ -58,7 +57,6 @@ else:

else:

# It's possible to have sizeof(long) != sizeof(Py_ssize_t).

class X(object):

def __len__(self):

return 1 << 31

try:

@@ -90,7 +88,7 @@ class _LazyDescr(object):

def __get__(self, obj, tp):

result = self._resolve()

- setattr(obj, self.name, result) # Invokes __set__.

+ setattr(obj, self.name, result) # Invokes __set__.

try:

# This is a bit ugly, but it avoids running this again by

# removing this descriptor.

@@ -162,14 +160,12 @@ class MovedAttribute(_LazyDescr):

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 = {}

@@ -227,7 +223,6 @@ _importer = _SixMetaPathImporter(__name__)

class _MovedItems(_LazyModule):

"""Lazy loading of moved objects"""

__path__ = [] # mark as package

@@ -239,10 +234,8 @@ _moved_attributes = [

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("reload_module", "__builtin__", "imp", "reload"),

MovedAttribute("reduce", "__builtin__", "functools"),

MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),

MovedAttribute("StringIO", "StringIO", "io"),

@@ -252,6 +245,7 @@ _moved_attributes = [

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"),

@@ -298,13 +292,8 @@ _moved_attributes = [

MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),

MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),

MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),

+ MovedModule("winreg", "_winreg"),

]

-# 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):

@@ -318,7 +307,6 @@ _importer._add_module(moves, "moves")

class Module_six_moves_urllib_parse(_LazyModule):

"""Lazy loading of moved objects in six.moves.urllib_parse"""

@@ -358,7 +346,6 @@ _importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_pa

class Module_six_moves_urllib_error(_LazyModule):

"""Lazy loading of moved objects in six.moves.urllib_error"""

@@ -378,7 +365,6 @@ _importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.er

class Module_six_moves_urllib_request(_LazyModule):

"""Lazy loading of moved objects in six.moves.urllib_request"""

@@ -428,7 +414,6 @@ _importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.

class Module_six_moves_urllib_response(_LazyModule):

"""Lazy loading of moved objects in six.moves.urllib_response"""

@@ -449,7 +434,6 @@ _importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib

class Module_six_moves_urllib_robotparser(_LazyModule):

"""Lazy loading of moved objects in six.moves.urllib_robotparser"""

@@ -467,7 +451,6 @@ _importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.url

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")

@@ -538,9 +521,6 @@ if PY3:

create_bound_method = types.MethodType

- def create_unbound_method(func, cls):

- return func

Iterator = object

else:

def get_unbound_function(unbound):

@@ -549,9 +529,6 @@ else:

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):

@@ -590,16 +567,16 @@ if PY3:

viewitems = operator.methodcaller("items")

else:

def iterkeys(d, **kw):

- return d.iterkeys(**kw)

+ return iter(d.iterkeys(**kw))

def itervalues(d, **kw):

- return d.itervalues(**kw)

+ return iter(d.itervalues(**kw))

def iteritems(d, **kw):

- return d.iteritems(**kw)

+ return iter(d.iteritems(**kw))

def iterlists(d, **kw):

- return d.iterlists(**kw)

+ return iter(d.iterlists(**kw))

viewkeys = operator.methodcaller("viewkeys")

@@ -618,66 +595,44 @@ _add_doc(iterlists,

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

+ if sys.version_info[1] <= 1:

+ def int2byte(i):

+ return bytes((i,))

+ else:

+ # This is about 2x faster than the implementation above on 3.2+

+ int2byte = operator.methodcaller("to_bytes", 1, "big")

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()

@@ -698,18 +653,13 @@ else:

_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):

+if sys.version_info > (3, 2):

exec_("""def raise_from(value, from_value):

raise value from from_value

""")

@@ -725,14 +675,13 @@ if print_ is None:

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):

+ isinstance(data, unicode) and

+ fp.encoding is not None):

errors = getattr(fp, "errors", None)

if errors is None:

errors = "strict"

@@ -773,15 +722,6 @@ if print_ is None:

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.""")

@@ -796,14 +736,12 @@ if sys.version_info[0:2] < (3, 4):

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', (), {})

@@ -824,25 +762,6 @@ def add_metaclass(metaclass):

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.

@@ -860,7 +779,7 @@ if sys.meta_path:

# 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__):

+ importer.name == __name__):

del sys.meta_path[i]

break

del i, importer