Merge lp:~jml/pkgme/tweaks into lp:pkgme

[Jonathan Lange]

Bunch of tweaks to remove pyflakes and to use slightly more modern (and probably faster) approaches where needed.

 * Use key, not cmp (changes algorithmic complexity from N**2 to max(N, O(sort(N)))
 * Use try_imports to import things based on availability
 * Don't assign to unused variables

[Jonathan Lange (jml)]

Oh also, changed the Python backend to use json.load rather than json.loads. All that means is that we let json worry about how much of the stream to store in memory, rather than loading it all in first.

[lp:~jml/pkgme/tweaks]

67. By Jonathan Lange on 2011-07-12

Don't read stdin ourselves. Let json do it.

[James Westby (james-w)]

Looks good to me, thanks.

Please go ahead and land.

Thanks,

James

review: Approve

=== modified file 'pkgme/backend.py'
--- pkgme/backend.py	2011-07-01 01:41:06 +0000
+++ pkgme/backend.py	2011-07-12 16:49:04 +0000
@@ -1,11 +1,10 @@
+from operator import attrgetter
 import os
 import sys
 
-try:
-    from sysconfig import get_platform
-except ImportError:
-    # Python < 2.7
-    from distutils.util import get_platform
+from testtools import try_imports
+
+get_platform = try_imports(['sysconfig.get_platform', 'distutils.util.get_platform'])
 
 from pkgme.project_info import (
     MultipleExternalHelpersInfo,
@@ -115,7 +114,7 @@
     def want(self, path):
         try:
             out = run_script(self.basepath, self.WANT_SCRIPT_NAME, path)
-        except ScriptMissing, e:
+        except ScriptMissing:
             raise AssertionError(
                 "Backend %s (%s) has no '%s' script"
                 % (self.name, self.basepath, self.WANT_SCRIPT_NAME))
@@ -186,7 +185,7 @@
             raise NoBackend()
         backend = eligble[0]
         if len(eligble) > 1:
-            eligble.sort(cmp=lambda x,y: cmp(x.name, y.name))
+            eligble.sort(key=attrgetter('name'))
             backend = eligble[0]
         return backend.get_info(path)
 

=== modified file 'pkgme/backends/python/all_info'
--- pkgme/backends/python/all_info	2010-12-13 01:34:21 +0000
+++ pkgme/backends/python/all_info	2011-07-12 16:49:04 +0000
@@ -9,7 +9,7 @@
 
 
 if __name__ == '__main__':
-    wanted = json.loads(sys.stdin.read())
+    wanted = json.load(sys.stdin)
     info_arg = "--pkgmeinfo=" + ",".join(wanted)
     tempdir = tempfile.mkdtemp()
     try:

=== modified file 'pkgme/tests/test_backend.py'
--- pkgme/tests/test_backend.py	2010-12-13 01:34:21 +0000
+++ pkgme/tests/test_backend.py	2011-07-12 16:49:04 +0000
@@ -204,7 +204,7 @@
         self.assertEqual([], loader.load())
 
     def test_ignores_missing_dirs(self):
-        tempdir = self.useFixture(TempdirFixture())
+        self.useFixture(TempdirFixture())
         loader = ExternalHelpersBackendLoader([self.getUniqueString()])
         self.assertEqual([], loader.load())