summaryrefslogtreecommitdiff
path: root/distutils2/pypi
diff options
context:
space:
mode:
author?ric Araujo <merwok@netwok.org>2011-11-23 13:31:27 +0100
committer?ric Araujo <merwok@netwok.org>2011-11-23 13:31:27 +0100
commitbb11fef9c016c68e89b8a83f1a95206859291d8a (patch)
tree17a428f0c69143d3a8130c1b984da94264024227 /distutils2/pypi
parent5bf02c43b4e6e8e8a23bb4b5269200b66ecfc4f2 (diff)
downloaddisutils2-bb11fef9c016c68e89b8a83f1a95206859291d8a.tar.gz
Better separate compat and _backport.
This moves individual backported functions from compat into a new _backport.misc module. compat regains its original purpose of containing 2to3 support code (i.e. compat for projects using distutils2, not internal compat for d2 code) and all backports now live under the private _backport subnamespace. Also fix the definition of ?any? to bind it to the builtin in 2.5+ (fsencode and detect_encoding not changed, they never exist in 2.x).
Diffstat (limited to 'distutils2/pypi')
-rw-r--r--distutils2/pypi/simple.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/distutils2/pypi/simple.py b/distutils2/pypi/simple.py
index 50b2c9c..46c9d1c 100644
--- a/distutils2/pypi/simple.py
+++ b/distutils2/pypi/simple.py
@@ -16,10 +16,9 @@ import os
from fnmatch import translate
from distutils2 import logger
-from distutils2.compat import wraps
-from distutils2.metadata import Metadata
-from distutils2.version import get_version_predicate
from distutils2 import __version__ as distutils2_version
+from distutils2.version import get_version_predicate
+from distutils2.metadata import Metadata
from distutils2.pypi.base import BaseClient
from distutils2.pypi.dist import (ReleasesList, EXTENSIONS,
get_infos_from_url, MD5_HASH)
@@ -27,6 +26,7 @@ from distutils2.pypi.errors import (PackagingPyPIError, DownloadError,
UnableToDownload, CantParseArchiveName,
ReleaseNotFound, ProjectNotFound)
from distutils2.pypi.mirrors import get_mirrors
+from distutils2._backport.misc import wraps
__all__ = ['Crawler', 'DEFAULT_SIMPLE_INDEX_URL']