[Python-checkins] distutils2: Fix a py3k warning, add FIXME notes

[tarek.ziade]

tarek.ziade pushed aaf402424b63 to distutils2:

http://hg.python.org/distutils2/rev/aaf402424b63
changeset:   586:aaf402424b63
user:        ?ric Araujo <merwok at netwok.org>
date:        Sun Aug 15 04:26:07 2010 +0200
summary:     Fix a py3k warning, add FIXME notes
files:       src/distutils2/index/simple.py, src/distutils2/metadata.py, src/distutils2/tests/test_register.py

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
@@ -160,12 +160,12 @@
         the results.
         """
         predicate = get_version_predicate(requirements)
-        if self._projects.has_key(predicate.name.lower()) and not force_update:
+        if predicate.name.lower() in self._projects and not force_update:
             return self._projects.get(predicate.name.lower())
         prefer_final = self._get_prefer_final(prefer_final)
         self._process_index_page(predicate.name)
 
-        if not self._projects.has_key(predicate.name.lower()):
+        if predicate.name.lower() not in self._projects:
             raise ProjectNotFound()
 
         releases = self._projects.get(predicate.name.lower())
diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -384,6 +384,7 @@
                 if not is_valid_predicate(v.split(';')[0]):
                     warn('"%s" is not a valid predicate (field "%s")' %
                          (v, name))
+        # FIXME this rejects UNKNOWN, is that right?
         elif name in _VERSIONS_FIELDS and value is not None:
             if not is_valid_versions(value):
                 warn('"%s" is not a valid version (field "%s")' %
diff --git a/src/distutils2/tests/test_register.py b/src/distutils2/tests/test_register.py
--- a/src/distutils2/tests/test_register.py
+++ b/src/distutils2/tests/test_register.py
@@ -168,6 +168,8 @@
         register_module.raw_input = inputs.__call__
         try:
             # let's run the command
+            # FIXME does this send a real request? use a mock server
+            # also, silence self.announce (with LoggingCatcher)
             cmd.run()
         finally:
             del register_module.raw_input

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