Adapt to new version of pylint.

diff --git a/Makefile b/Makefile
index 4facc63e77962ed16ceebecd0a22f41c0ad74058..d684e27d7a1913fe2c0d32cfb8f901f93be5638f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,9 +39,9 @@ pychecker:
        @-pychecker --only --limit 50 freecode-submit.py
        @rm -f freecode-submit.py
 
-PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0301,C0323,R0903,R0912,R0914,W0141,W0621,F0401,E0611,E1101"
+PYLINTOPTS = --rcfile=/dev/null --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" --dummy-variables-rgx='^_' --reports=n --disable="C0103,C0301,C0323,C1001,R0903,R0912,R0914,W0110,W0141,W0621,F0401,E0611,E1101"
 pylint:
-       @pylint --output-format=parseable $(PYLINTOPTS) freecode-submit
+       @pylint $(PYLINTOPTS) freecode-submit
 
 clean:
        rm -f *.pyc *.html freecode-submit.1 MANIFEST ChangeLog *~

diff --git a/freecode-submit b/freecode-submit
index 97732467d61ec56445d6544dd4acbc264e9c732f..115f68c33ec94b18d6acee43c6afeca3a3b04f1c 100755 (executable)
--- a/freecode-submit
+++ b/freecode-submit
@@ -100,8 +100,8 @@ class FreecodeSession:
         self.project_data = content['project']
         #if self.verbose:
         #    print "Project data: %s" % self.project_data
-        self.permalink = self.project_data['permalink'] 
-        self.id = self.project_data['id'] 
+        self.permalink = self.project_data['permalink']
+        self.id = self.project_data['id']
 
     def edit_request(self, url, method="GET", request=None, force=False):
         "Wrap a JSON object with the auth code and ship it as a request"
@@ -152,7 +152,7 @@ class FreecodeSession:
                 vid = properties["id"]
                 break
         else:
-            raise FreecodeSessionException("couldn't find release %s"%dversion) 
+            raise FreecodeSessionException("couldn't find release %s"%dversion)
         deletelink = "projects/%s/releases/%s.json" % (self.permalink, vid)
         self.edit_request(deletelink, "DELETE", {})
 
@@ -288,7 +288,7 @@ class FreecodeMetadataFactory:
             raise FreecodeSessionException("Version conflict in options.")
         # Hidden flag special handling
         if "hidden_from_frontpage" in data:
-            data["hidden_from_frontpage"] = data["hidden_from_frontpage"] in ("Y", "y") 
+            data["hidden_from_frontpage"] = data["hidden_from_frontpage"] in ("Y", "y")
         # Now merge in the URLs, doing symbol substitution
         urllist = []
         for (label, furl) in urls.items():
@@ -296,7 +296,7 @@ class FreecodeMetadataFactory:
                 if type(v) == type(""):
                     furl = furl.replace('${' + k + '}', v)
             urllist.append((label, furl))
-        # Sort out what things go where 
+        # Sort out what things go where
         update = Update()
         if options.showversion:
             pass
@@ -329,7 +329,7 @@ if __name__ == "__main__":
         showversion  = 'showversion' in options.__dict__ and options.showversion
         if showversion:
             print "freecode-submit", version
-            raise SystemExit, 0
+            raise SystemExit(0)
         # Time to ship the update.
         # Establish session
         session = FreecodeSession(verbose=int(verbose), emit_enable=not dryrun)
@@ -338,7 +338,7 @@ if __name__ == "__main__":
         except ValueError, e:
             print e
             print >>sys.stderr, "freecode-submit: looks like a server-side problem at freecode; bailing out."
-            raise SystemExit, 1
+            raise SystemExit(1)
         if options.query:
             print "Project: %s" % session.project_data["name"]
             print "Summary: %s" % session.project_data["oneliner"]
@@ -358,7 +358,7 @@ if __name__ == "__main__":
                 print "%s-URL: %s" % (assoc["label"].replace(" ","-"), assoc["redirector"])
             if 'recent_releases' in session.project_data and session.project_data['recent_releases']:
                 most_recent = session.project_data['recent_releases'][0]
-                print "Version: %s" % most_recent['version'] 
+                print "Version: %s" % most_recent['version']
                 print "Tag-List: %s" % ",".join(most_recent['tag_list'])
                 if most_recent.get('hidden_from_frontpage'):
                     print "Hide: Y"