Restoring authorship annotation for <[email protected]>. Commit 2 of 2.

10 files changed, 201 insertions, 201 deletions

diff --git a/contrib/python/packaging/py2/packaging/_structures.py b/contrib/python/packaging/py2/packaging/_structures.py
index eccc677d8d9..800d5c5588c 100644
--- a/contrib/python/packaging/py2/packaging/_structures.py
+++ b/contrib/python/packaging/py2/packaging/_structures.py
@@ -41,7 +41,7 @@ class InfinityType(object):
         # type: (object) -> NegativeInfinityType
         return NegativeInfinity
 
- 
+
 Infinity = InfinityType()
 
 
@@ -82,5 +82,5 @@ class NegativeInfinityType(object):
         # type: (object) -> InfinityType
         return Infinity
 
- 
+
 NegativeInfinity = NegativeInfinityType()
diff --git a/contrib/python/packaging/py2/packaging/requirements.py b/contrib/python/packaging/py2/packaging/requirements.py
index 4675aad33cf..aa69d50d1a2 100644
--- a/contrib/python/packaging/py2/packaging/requirements.py
+++ b/contrib/python/packaging/py2/packaging/requirements.py
@@ -80,8 +80,8 @@ MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
 MARKER_EXPR.setParseAction(
     lambda s, l, t: Marker(s[t._original_start : t._original_end])
 )
-MARKER_SEPARATOR = SEMICOLON 
-MARKER = MARKER_SEPARATOR + MARKER_EXPR 
+MARKER_SEPARATOR = SEMICOLON
+MARKER = MARKER_SEPARATOR + MARKER_EXPR
 
 VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
 URL_AND_MARKER = URL + Optional(MARKER)
@@ -89,9 +89,9 @@ URL_AND_MARKER = URL + Optional(MARKER)
 NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
 
 REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
-# pyparsing isn't thread safe during initialization, so we do it eagerly, see 
-# issue #104 
-REQUIREMENT.parseString("x[]") 
+# pyparsing isn't thread safe during initialization, so we do it eagerly, see
+# issue #104
+REQUIREMENT.parseString("x[]")
 
 
 class Requirement(object):
@@ -127,7 +127,7 @@ class Requirement(object):
             elif not (parsed_url.scheme and parsed_url.netloc) or (
                 not parsed_url.scheme and not parsed_url.netloc
             ):
-                raise InvalidRequirement("Invalid URL: {0}".format(req.url)) 
+                raise InvalidRequirement("Invalid URL: {0}".format(req.url))
             self.url = req.url  # type: TOptional[str]
         else:
             self.url = None
diff --git a/contrib/python/packaging/py2/packaging/specifiers.py b/contrib/python/packaging/py2/packaging/specifiers.py
index 695d88be1e6..a6a83c1fe93 100644
--- a/contrib/python/packaging/py2/packaging/specifiers.py
+++ b/contrib/python/packaging/py2/packaging/specifiers.py
@@ -238,7 +238,7 @@ class _IndividualSpecifier(BaseSpecifier):
                 ):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the beginning. 
+                # accepting prereleases from the beginning.
                 else:
                     yielded = True
                     yield version
@@ -582,7 +582,7 @@ class Specifier(_IndividualSpecifier):
                 return False
 
         # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is technically greater than, to match. 
+        # in the specifier, which is technically greater than, to match.
         if prospective.local is not None:
             if Version(prospective.base_version) == Version(spec.base_version):
                 return False
diff --git a/contrib/python/packaging/py2/packaging/utils.py b/contrib/python/packaging/py2/packaging/utils.py
index 341ca66c62e..6e8c2a3e5bb 100644
--- a/contrib/python/packaging/py2/packaging/utils.py
+++ b/contrib/python/packaging/py2/packaging/utils.py
@@ -7,11 +7,11 @@ import re
 
 from ._typing import TYPE_CHECKING, cast
 from .tags import Tag, parse_tag
-from .version import InvalidVersion, Version 
+from .version import InvalidVersion, Version
 
 if TYPE_CHECKING:  # pragma: no cover
     from typing import FrozenSet, NewType, Tuple, Union
- 
+
     BuildTag = Union[Tuple[()], Tuple[int, str]]
     NormalizedName = NewType("NormalizedName", str)
 else:
@@ -41,48 +41,48 @@ def canonicalize_name(name):
     # This is taken from PEP 503.
     value = _canonicalize_regex.sub("-", name).lower()
     return cast(NormalizedName, value)
- 
- 
+
+
 def canonicalize_version(version):
     # type: (Union[Version, str]) -> Union[Version, str]
-    """ 
+    """
     This is very similar to Version.__str__, but has one subtle difference
-    with the way it handles the release segment. 
-    """ 
+    with the way it handles the release segment.
+    """
     if not isinstance(version, Version):
         try:
             version = Version(version)
         except InvalidVersion:
             # Legacy versions cannot be normalized
             return version
- 
-    parts = [] 
- 
-    # Epoch 
-    if version.epoch != 0: 
-        parts.append("{0}!".format(version.epoch)) 
- 
-    # Release segment 
-    # NB: This strips trailing '.0's to normalize 
+
+    parts = []
+
+    # Epoch
+    if version.epoch != 0:
+        parts.append("{0}!".format(version.epoch))
+
+    # Release segment
+    # NB: This strips trailing '.0's to normalize
     parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in version.release)))
- 
-    # Pre-release 
-    if version.pre is not None: 
-        parts.append("".join(str(x) for x in version.pre)) 
- 
-    # Post-release 
-    if version.post is not None: 
-        parts.append(".post{0}".format(version.post)) 
- 
-    # Development release 
-    if version.dev is not None: 
-        parts.append(".dev{0}".format(version.dev)) 
- 
-    # Local version segment 
-    if version.local is not None: 
-        parts.append("+{0}".format(version.local)) 
- 
-    return "".join(parts) 
+
+    # Pre-release
+    if version.pre is not None:
+        parts.append("".join(str(x) for x in version.pre))
+
+    # Post-release
+    if version.post is not None:
+        parts.append(".post{0}".format(version.post))
+
+    # Development release
+    if version.dev is not None:
+        parts.append(".dev{0}".format(version.dev))
+
+    # Local version segment
+    if version.local is not None:
+        parts.append("+{0}".format(version.local))
+
+    return "".join(parts)
 
 
 def parse_wheel_filename(filename):
diff --git a/contrib/python/packaging/py2/packaging/version.py b/contrib/python/packaging/py2/packaging/version.py
index 43849134077..517d91f2485 100644
--- a/contrib/python/packaging/py2/packaging/version.py
+++ b/contrib/python/packaging/py2/packaging/version.py
@@ -149,31 +149,31 @@ class LegacyVersion(_BaseVersion):
         return self._version
 
     @property
-    def epoch(self): 
+    def epoch(self):
         # type: () -> int
-        return -1 
- 
-    @property 
-    def release(self): 
+        return -1
+
+    @property
+    def release(self):
         # type: () -> None
-        return None 
- 
-    @property 
-    def pre(self): 
+        return None
+
+    @property
+    def pre(self):
         # type: () -> None
-        return None 
- 
-    @property 
-    def post(self): 
+        return None
+
+    @property
+    def post(self):
         # type: () -> None
-        return None 
- 
-    @property 
-    def dev(self): 
+        return None
+
+    @property
+    def dev(self):
         # type: () -> None
-        return None 
- 
-    @property 
+        return None
+
+    @property
     def local(self):
         # type: () -> None
         return None
@@ -188,12 +188,12 @@ class LegacyVersion(_BaseVersion):
         # type: () -> bool
         return False
 
-    @property 
-    def is_devrelease(self): 
+    @property
+    def is_devrelease(self):
         # type: () -> bool
-        return False 
+        return False
+
 
- 
 _legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
 
 _legacy_version_replacement_map = {
@@ -250,7 +250,7 @@ def _legacy_cmpkey(version):
 
     return epoch, tuple(parts)
 
- 
+
 # Deliberately not anchored to the start and end of the string, to make it
 # easier for 3rd party code to reuse
 VERSION_PATTERN = r"""
@@ -328,67 +328,67 @@ class Version(_BaseVersion):
         parts = []
 
         # Epoch
-        if self.epoch != 0: 
-            parts.append("{0}!".format(self.epoch)) 
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
 
         # Release segment
-        parts.append(".".join(str(x) for x in self.release)) 
+        parts.append(".".join(str(x) for x in self.release))
 
         # Pre-release
-        if self.pre is not None: 
-            parts.append("".join(str(x) for x in self.pre)) 
+        if self.pre is not None:
+            parts.append("".join(str(x) for x in self.pre))
 
         # Post-release
-        if self.post is not None: 
-            parts.append(".post{0}".format(self.post)) 
+        if self.post is not None:
+            parts.append(".post{0}".format(self.post))
 
         # Development release
-        if self.dev is not None: 
-            parts.append(".dev{0}".format(self.dev)) 
+        if self.dev is not None:
+            parts.append(".dev{0}".format(self.dev))
 
         # Local version segment
-        if self.local is not None: 
-            parts.append("+{0}".format(self.local)) 
+        if self.local is not None:
+            parts.append("+{0}".format(self.local))
 
         return "".join(parts)
 
     @property
-    def epoch(self): 
+    def epoch(self):
         # type: () -> int
         _epoch = self._version.epoch  # type: int
         return _epoch
- 
-    @property 
-    def release(self): 
+
+    @property
+    def release(self):
         # type: () -> Tuple[int, ...]
         _release = self._version.release  # type: Tuple[int, ...]
         return _release
- 
-    @property 
-    def pre(self): 
+
+    @property
+    def pre(self):
         # type: () -> Optional[Tuple[str, int]]
         _pre = self._version.pre  # type: Optional[Tuple[str, int]]
         return _pre
- 
-    @property 
-    def post(self): 
+
+    @property
+    def post(self):
         # type: () -> Optional[Tuple[str, int]]
-        return self._version.post[1] if self._version.post else None 
- 
-    @property 
-    def dev(self): 
+        return self._version.post[1] if self._version.post else None
+
+    @property
+    def dev(self):
         # type: () -> Optional[Tuple[str, int]]
-        return self._version.dev[1] if self._version.dev else None 
- 
-    @property 
-    def local(self): 
+        return self._version.dev[1] if self._version.dev else None
+
+    @property
+    def local(self):
         # type: () -> Optional[str]
-        if self._version.local: 
-            return ".".join(str(x) for x in self._version.local) 
-        else: 
-            return None 
- 
-    @property 
+        if self._version.local:
+            return ".".join(str(x) for x in self._version.local)
+        else:
+            return None
+
+    @property
     def public(self):
         # type: () -> str
         return str(self).split("+", 1)[0]
@@ -399,34 +399,34 @@ class Version(_BaseVersion):
         parts = []
 
         # Epoch
-        if self.epoch != 0: 
-            parts.append("{0}!".format(self.epoch)) 
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
 
         # Release segment
-        parts.append(".".join(str(x) for x in self.release)) 
+        parts.append(".".join(str(x) for x in self.release))
 
         return "".join(parts)
 
     @property
     def is_prerelease(self):
         # type: () -> bool
-        return self.dev is not None or self.pre is not None 
+        return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self):
         # type: () -> bool
-        return self.post is not None 
+        return self.post is not None
 
-    @property 
-    def is_devrelease(self): 
+    @property
+    def is_devrelease(self):
         # type: () -> bool
-        return self.dev is not None 
+        return self.dev is not None
 
     @property
     def major(self):
         # type: () -> int
         return self.release[0] if len(self.release) >= 1 else 0
- 
+
     @property
     def minor(self):
         # type: () -> int
@@ -476,7 +476,7 @@ def _parse_letter_version(
     return None
 
 
-_local_version_separators = re.compile(r"[\._-]") 
+_local_version_separators = re.compile(r"[\._-]")
 
 
 def _parse_local_version(local):
@@ -487,7 +487,7 @@ def _parse_local_version(local):
     if local is not None:
         return tuple(
             part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_separators.split(local) 
+            for part in _local_version_separators.split(local)
         )
     return None
 
diff --git a/contrib/python/packaging/py3/packaging/_structures.py b/contrib/python/packaging/py3/packaging/_structures.py
index e6339ed9be5..90a6465f968 100644
--- a/contrib/python/packaging/py3/packaging/_structures.py
+++ b/contrib/python/packaging/py3/packaging/_structures.py
@@ -28,7 +28,7 @@ class InfinityType:
     def __neg__(self: object) -> "NegativeInfinityType":
         return NegativeInfinity
 
- 
+
 Infinity = InfinityType()
 
 
@@ -57,5 +57,5 @@ class NegativeInfinityType:
     def __neg__(self: object) -> InfinityType:
         return Infinity
 
- 
+
 NegativeInfinity = NegativeInfinityType()
diff --git a/contrib/python/packaging/py3/packaging/requirements.py b/contrib/python/packaging/py3/packaging/requirements.py
index 6a439cd6682..53f9a3aa42b 100644
--- a/contrib/python/packaging/py3/packaging/requirements.py
+++ b/contrib/python/packaging/py3/packaging/requirements.py
@@ -70,8 +70,8 @@ MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
 MARKER_EXPR.setParseAction(
     lambda s, l, t: Marker(s[t._original_start : t._original_end])
 )
-MARKER_SEPARATOR = SEMICOLON 
-MARKER = MARKER_SEPARATOR + MARKER_EXPR 
+MARKER_SEPARATOR = SEMICOLON
+MARKER = MARKER_SEPARATOR + MARKER_EXPR
 
 VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
 URL_AND_MARKER = URL + Optional(MARKER)
@@ -79,9 +79,9 @@ URL_AND_MARKER = URL + Optional(MARKER)
 NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
 
 REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
-# pyparsing isn't thread safe during initialization, so we do it eagerly, see 
-# issue #104 
-REQUIREMENT.parseString("x[]") 
+# pyparsing isn't thread safe during initialization, so we do it eagerly, see
+# issue #104
+REQUIREMENT.parseString("x[]")
 
 
 class Requirement:
diff --git a/contrib/python/packaging/py3/packaging/specifiers.py b/contrib/python/packaging/py3/packaging/specifiers.py
index 76202dc3d39..0e218a6f9f7 100644
--- a/contrib/python/packaging/py3/packaging/specifiers.py
+++ b/contrib/python/packaging/py3/packaging/specifiers.py
@@ -211,7 +211,7 @@ class _IndividualSpecifier(BaseSpecifier):
                 ):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the beginning. 
+                # accepting prereleases from the beginning.
                 else:
                     yielded = True
                     yield version
@@ -536,7 +536,7 @@ class Specifier(_IndividualSpecifier):
                 return False
 
         # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is technically greater than, to match. 
+        # in the specifier, which is technically greater than, to match.
         if prospective.local is not None:
             if Version(prospective.base_version) == Version(spec.base_version):
                 return False
diff --git a/contrib/python/packaging/py3/packaging/utils.py b/contrib/python/packaging/py3/packaging/utils.py
index 2da24c30e9f..bab11b80c60 100644
--- a/contrib/python/packaging/py3/packaging/utils.py
+++ b/contrib/python/packaging/py3/packaging/utils.py
@@ -6,11 +6,11 @@ import re
 from typing import FrozenSet, NewType, Tuple, Union, cast
 
 from .tags import Tag, parse_tag
-from .version import InvalidVersion, Version 
+from .version import InvalidVersion, Version
 
 BuildTag = Union[Tuple[()], Tuple[int, str]]
 NormalizedName = NewType("NormalizedName", str)
- 
+
 
 class InvalidWheelFilename(ValueError):
     """
@@ -33,13 +33,13 @@ def canonicalize_name(name: str) -> NormalizedName:
     # This is taken from PEP 503.
     value = _canonicalize_regex.sub("-", name).lower()
     return cast(NormalizedName, value)
- 
- 
+
+
 def canonicalize_version(version: Union[Version, str]) -> str:
-    """ 
+    """
     This is very similar to Version.__str__, but has one subtle difference
-    with the way it handles the release segment. 
-    """ 
+    with the way it handles the release segment.
+    """
     if isinstance(version, str):
         try:
             parsed = Version(version)
@@ -48,34 +48,34 @@ def canonicalize_version(version: Union[Version, str]) -> str:
             return version
     else:
         parsed = version
- 
-    parts = [] 
- 
-    # Epoch 
+
+    parts = []
+
+    # Epoch
     if parsed.epoch != 0:
         parts.append(f"{parsed.epoch}!")
- 
-    # Release segment 
-    # NB: This strips trailing '.0's to normalize 
+
+    # Release segment
+    # NB: This strips trailing '.0's to normalize
     parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in parsed.release)))
- 
-    # Pre-release 
+
+    # Pre-release
     if parsed.pre is not None:
         parts.append("".join(str(x) for x in parsed.pre))
- 
-    # Post-release 
+
+    # Post-release
     if parsed.post is not None:
         parts.append(f".post{parsed.post}")
- 
-    # Development release 
+
+    # Development release
     if parsed.dev is not None:
         parts.append(f".dev{parsed.dev}")
- 
-    # Local version segment 
+
+    # Local version segment
     if parsed.local is not None:
         parts.append(f"+{parsed.local}")
- 
-    return "".join(parts) 
+
+    return "".join(parts)
 
 
 def parse_wheel_filename(
diff --git a/contrib/python/packaging/py3/packaging/version.py b/contrib/python/packaging/py3/packaging/version.py
index 91dba8ee9b5..de9a09a4ed3 100644
--- a/contrib/python/packaging/py3/packaging/version.py
+++ b/contrib/python/packaging/py3/packaging/version.py
@@ -130,25 +130,25 @@ class LegacyVersion(_BaseVersion):
 
     @property
     def epoch(self) -> int:
-        return -1 
- 
-    @property 
+        return -1
+
+    @property
     def release(self) -> None:
-        return None 
- 
-    @property 
+        return None
+
+    @property
     def pre(self) -> None:
-        return None 
- 
-    @property 
+        return None
+
+    @property
     def post(self) -> None:
-        return None 
- 
-    @property 
+        return None
+
+    @property
     def dev(self) -> None:
-        return None 
- 
-    @property 
+        return None
+
+    @property
     def local(self) -> None:
         return None
 
@@ -160,11 +160,11 @@ class LegacyVersion(_BaseVersion):
     def is_postrelease(self) -> bool:
         return False
 
-    @property 
+    @property
     def is_devrelease(self) -> bool:
-        return False 
+        return False
+
 
- 
 _legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
 
 _legacy_version_replacement_map = {
@@ -219,7 +219,7 @@ def _legacy_cmpkey(version: str) -> LegacyCmpKey:
 
     return epoch, tuple(parts)
 
- 
+
 # Deliberately not anchored to the start and end of the string, to make it
 # easier for 3rd party code to reuse
 VERSION_PATTERN = r"""
@@ -294,26 +294,26 @@ class Version(_BaseVersion):
         parts = []
 
         # Epoch
-        if self.epoch != 0: 
+        if self.epoch != 0:
             parts.append(f"{self.epoch}!")
 
         # Release segment
-        parts.append(".".join(str(x) for x in self.release)) 
+        parts.append(".".join(str(x) for x in self.release))
 
         # Pre-release
-        if self.pre is not None: 
-            parts.append("".join(str(x) for x in self.pre)) 
+        if self.pre is not None:
+            parts.append("".join(str(x) for x in self.pre))
 
         # Post-release
-        if self.post is not None: 
+        if self.post is not None:
             parts.append(f".post{self.post}")
 
         # Development release
-        if self.dev is not None: 
+        if self.dev is not None:
             parts.append(f".dev{self.dev}")
 
         # Local version segment
-        if self.local is not None: 
+        if self.local is not None:
             parts.append(f"+{self.local}")
 
         return "".join(parts)
@@ -322,33 +322,33 @@ class Version(_BaseVersion):
     def epoch(self) -> int:
         _epoch: int = self._version.epoch
         return _epoch
- 
-    @property 
+
+    @property
     def release(self) -> Tuple[int, ...]:
         _release: Tuple[int, ...] = self._version.release
         return _release
- 
-    @property 
+
+    @property
     def pre(self) -> Optional[Tuple[str, int]]:
         _pre: Optional[Tuple[str, int]] = self._version.pre
         return _pre
- 
-    @property 
+
+    @property
     def post(self) -> Optional[int]:
-        return self._version.post[1] if self._version.post else None 
- 
-    @property 
+        return self._version.post[1] if self._version.post else None
+
+    @property
     def dev(self) -> Optional[int]:
-        return self._version.dev[1] if self._version.dev else None 
- 
-    @property 
+        return self._version.dev[1] if self._version.dev else None
+
+    @property
     def local(self) -> Optional[str]:
-        if self._version.local: 
-            return ".".join(str(x) for x in self._version.local) 
-        else: 
-            return None 
- 
-    @property 
+        if self._version.local:
+            return ".".join(str(x) for x in self._version.local)
+        else:
+            return None
+
+    @property
     def public(self) -> str:
         return str(self).split("+", 1)[0]
 
@@ -357,30 +357,30 @@ class Version(_BaseVersion):
         parts = []
 
         # Epoch
-        if self.epoch != 0: 
+        if self.epoch != 0:
             parts.append(f"{self.epoch}!")
 
         # Release segment
-        parts.append(".".join(str(x) for x in self.release)) 
+        parts.append(".".join(str(x) for x in self.release))
 
         return "".join(parts)
 
     @property
     def is_prerelease(self) -> bool:
-        return self.dev is not None or self.pre is not None 
+        return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self) -> bool:
-        return self.post is not None 
+        return self.post is not None
 
-    @property 
+    @property
     def is_devrelease(self) -> bool:
-        return self.dev is not None 
+        return self.dev is not None
 
     @property
     def major(self) -> int:
         return self.release[0] if len(self.release) >= 1 else 0
- 
+
     @property
     def minor(self) -> int:
         return self.release[1] if len(self.release) >= 2 else 0
@@ -426,7 +426,7 @@ def _parse_letter_version(
     return None
 
 
-_local_version_separators = re.compile(r"[\._-]") 
+_local_version_separators = re.compile(r"[\._-]")
 
 
 def _parse_local_version(local: str) -> Optional[LocalType]:
@@ -436,7 +436,7 @@ def _parse_local_version(local: str) -> Optional[LocalType]:
     if local is not None:
         return tuple(
             part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_separators.split(local) 
+            for part in _local_version_separators.split(local)
         )
     return None