aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/conf.py120
-rw-r--r--setuptools/py26compat.py20
-rw-r--r--setuptools/py27compat.py12
-rw-r--r--setuptools/tests/py26compat.py8
4 files changed, 80 insertions, 80 deletions
diff --git a/docs/conf.py b/docs/conf.py
index f315e2b7..604e7138 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -200,64 +200,64 @@ latex_documents = [
#latex_use_modindex = True
link_files = {
- 'CHANGES.rst': dict(
- using=dict(
- BB='https://bitbucket.org',
- GH='https://github.com',
- ),
- replace=[
- dict(
- pattern=r"(Issue )?#(?P<issue>\d+)",
- url='{GH}/pypa/setuptools/issues/{issue}',
- ),
- dict(
- pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
- url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
- ),
- dict(
- pattern=r"Distribute #(?P<distribute>\d+)",
- url='{BB}/tarek/distribute/issue/{distribute}',
- ),
- dict(
- pattern=r"Buildout #(?P<buildout>\d+)",
- url='{GH}/buildout/buildout/issues/{buildout}',
- ),
- dict(
- pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
- url='http://bugs.python.org/setuptools/issue{old_setuptools}',
- ),
- dict(
- pattern=r"Jython #(?P<jython>\d+)",
- url='http://bugs.jython.org/issue{jython}',
- ),
- dict(
- pattern=r"Python #(?P<python>\d+)",
- url='http://bugs.python.org/issue{python}',
- ),
- dict(
- pattern=r"Interop #(?P<interop>\d+)",
- url='{GH}/pypa/interoperability-peps/issues/{interop}',
- ),
- dict(
- pattern=r"Pip #(?P<pip>\d+)",
- url='{GH}/pypa/pip/issues/{pip}',
- ),
- dict(
- pattern=r"Packaging #(?P<packaging>\d+)",
- url='{GH}/pypa/packaging/issues/{packaging}',
- ),
- dict(
- pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
- url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
- ),
- dict(
- pattern=r"PEP[- ](?P<pep_number>\d+)",
- url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
- ),
- dict(
- pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
- with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
- ),
- ],
- ),
+ 'CHANGES.rst': dict(
+ using=dict(
+ BB='https://bitbucket.org',
+ GH='https://github.com',
+ ),
+ replace=[
+ dict(
+ pattern=r"(Issue )?#(?P<issue>\d+)",
+ url='{GH}/pypa/setuptools/issues/{issue}',
+ ),
+ dict(
+ pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
+ url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
+ ),
+ dict(
+ pattern=r"Distribute #(?P<distribute>\d+)",
+ url='{BB}/tarek/distribute/issue/{distribute}',
+ ),
+ dict(
+ pattern=r"Buildout #(?P<buildout>\d+)",
+ url='{GH}/buildout/buildout/issues/{buildout}',
+ ),
+ dict(
+ pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
+ url='http://bugs.python.org/setuptools/issue{old_setuptools}',
+ ),
+ dict(
+ pattern=r"Jython #(?P<jython>\d+)",
+ url='http://bugs.jython.org/issue{jython}',
+ ),
+ dict(
+ pattern=r"Python #(?P<python>\d+)",
+ url='http://bugs.python.org/issue{python}',
+ ),
+ dict(
+ pattern=r"Interop #(?P<interop>\d+)",
+ url='{GH}/pypa/interoperability-peps/issues/{interop}',
+ ),
+ dict(
+ pattern=r"Pip #(?P<pip>\d+)",
+ url='{GH}/pypa/pip/issues/{pip}',
+ ),
+ dict(
+ pattern=r"Packaging #(?P<packaging>\d+)",
+ url='{GH}/pypa/packaging/issues/{packaging}',
+ ),
+ dict(
+ pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
+ url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
+ ),
+ dict(
+ pattern=r"PEP[- ](?P<pep_number>\d+)",
+ url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+ ),
+ dict(
+ pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
+ with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
+ ),
+ ],
+ ),
}
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index e52bd85b..40cbb88e 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -5,18 +5,18 @@ Compatibility Support for Python 2.6 and earlier
import sys
try:
- from urllib.parse import splittag
+ from urllib.parse import splittag
except ImportError:
- from urllib import splittag
+ from urllib import splittag
def strip_fragment(url):
- """
- In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
- later was patched to disregard the fragment when making URL requests.
- Do the same for Python 2.6 and earlier.
- """
- url, fragment = splittag(url)
- return url
+ """
+ In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
+ later was patched to disregard the fragment when making URL requests.
+ Do the same for Python 2.6 and earlier.
+ """
+ url, fragment = splittag(url)
+ return url
if sys.version_info >= (2,7):
- strip_fragment = lambda x: x
+ strip_fragment = lambda x: x
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 9d2886db..702f7d65 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -5,11 +5,11 @@ Compatibility Support for Python 2.7 and earlier
import sys
def get_all_headers(message, key):
- """
- Given an HTTPMessage, return all headers matching a given key.
- """
- return message.get_all(key)
+ """
+ Given an HTTPMessage, return all headers matching a given key.
+ """
+ return message.get_all(key)
if sys.version_info < (3,):
- def get_all_headers(message, key):
- return message.getheaders(key)
+ def get_all_headers(message, key):
+ return message.getheaders(key)
diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index c5680881..7211f275 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -3,10 +3,10 @@ import tarfile
import contextlib
def _tarfile_open_ex(*args, **kwargs):
- """
- Extend result as a context manager.
- """
- return contextlib.closing(tarfile.open(*args, **kwargs))
+ """
+ Extend result as a context manager.
+ """
+ return contextlib.closing(tarfile.open(*args, **kwargs))
if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2):
tarfile_open = _tarfile_open_ex
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 22:30:27 +0000