[Python-checkins] distutils2: Some import stuff for indexes.

[tarek.ziade]

tarek.ziade pushed ea3793e32154 to distutils2:

http://hg.python.org/distutils2/rev/ea3793e32154
changeset:   458:ea3793e32154
user:        Alexis Metaireau <ametaireau at gmail.com>
date:        Mon Jul 26 16:10:24 2010 +0200
summary:     Some import stuff for indexes.
files:       src/distutils2/index/__init__.py, src/distutils2/index/dist.py, src/distutils2/index/simple.py, src/distutils2/index/xmlrpc.py

diff --git a/src/distutils2/index/__init__.py b/src/distutils2/index/__init__.py
--- a/src/distutils2/index/__init__.py
+++ b/src/distutils2/index/__init__.py
@@ -1,8 +1,11 @@
-"""distutils2.index
+"""Package containing ways to interact with Index APIs.
 
-Package containing ways to interact with Index APIs.
-""" 
+"""
 
 __all__ = ['simple',
+           'xmlrpc',
            'dist',
-]
+           'errors',
+           'mirrors',]
+
+from dist import ReleaseInfo, ReleasesList, DistInfo
diff --git a/src/distutils2/index/dist.py b/src/distutils2/index/dist.py
--- a/src/distutils2/index/dist.py
+++ b/src/distutils2/index/dist.py
@@ -26,6 +26,8 @@
 from distutils2.version import suggest_normalized_version, NormalizedVersion
 from distutils2.metadata import DistributionMetadata
 
+__all__ = ['ReleaseInfo', 'DistInfo', 'ReleasesList', 'get_infos_from_url']
+
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz .egg".split()
 MD5_HASH = re.compile(r'^.*#md5=([a-f0-9]+)$')
 DIST_TYPES = ['bdist', 'sdist']
diff --git a/src/distutils2/index/simple.py b/src/distutils2/index/simple.py
--- a/src/distutils2/index/simple.py
+++ b/src/distutils2/index/simple.py
@@ -22,8 +22,10 @@
 from distutils2.index.mirrors import get_mirrors
 from distutils2 import __version__ as __distutils2_version__
 
+__all__ = ['Crawler', 'DEFAULT_SIMPLE_INDEX_URL'] 
+
 # -- Constants -----------------------------------------------
-DEFAULT_INDEX_URL = "http://a.pypi.python.org/simple/"
+DEFAULT_SIMPLE_INDEX_URL = "http://a.pypi.python.org/simple/"
 DEFAULT_HOSTS = ("*",)
 SOCKET_TIMEOUT = 15
 USER_AGENT = "Python-urllib/%s distutils2/%s" % (
@@ -105,7 +107,7 @@
                                on mirrors before switching.
     """
 
-    def __init__(self, index_url=DEFAULT_INDEX_URL, prefer_final=False,
+    def __init__(self, index_url=DEFAULT_SIMPLE_INDEX_URL, prefer_final=False,
                  prefer_source=True, hosts=DEFAULT_HOSTS,
                  follow_externals=False, mirrors_url=None, mirrors=None,
                  timeout=SOCKET_TIMEOUT, mirrors_max_tries=0):
diff --git a/src/distutils2/index/xmlrpc.py b/src/distutils2/index/xmlrpc.py
--- a/src/distutils2/index/xmlrpc.py
+++ b/src/distutils2/index/xmlrpc.py
@@ -6,8 +6,9 @@
 from distutils2.index.errors import ProjectNotFound, InvalidSearchField
 from distutils2.index.dist import ReleaseInfo
 
+__all__ = ['Client', 'DEFAULT_XMLRPC_INDEX_URL']
 
-PYPI_XML_RPC_URL = 'http://python.org/pypi'
+DEFAULT_XMLRPC_INDEX_URL = 'http://python.org/pypi'
 
 _SEARCH_FIELDS = ['name', 'version', 'author', 'author_email', 'maintainer',
                   'maintainer_email', 'home_page', 'license', 'summary',
@@ -18,10 +19,10 @@
     """Client to query indexes using XML-RPC method calls.
 
     If no server_url is specified, use the default PyPI XML-RPC URL,
-    defined in the PYPI_XML_RPC_URL constant::
+    defined in the DEFAULT_XMLRPC_INDEX_URL constant::
 
         >>> client = XMLRPCClient()
-        >>> client.server_url == PYPI_XML_RPC_URL
+        >>> client.server_url == DEFAULT_XMLRPC_INDEX_URL
         True
 
         >>> client = XMLRPCClient("http://someurl/")
@@ -29,7 +30,7 @@
         'http://someurl/'
     """
 
-    def __init__(self, server_url=PYPI_XML_RPC_URL, prefer_final=False,
+    def __init__(self, server_url=DEFAULT_XMLRPC_INDEX_URL, prefer_final=False,
                  prefer_source=True):
         super(Client, self).__init__(prefer_final, prefer_source)
         self.server_url = server_url

--
Repository URL: http://hg.python.org/distutils2