[Pkg-mozext-commits] [mozilla-devscripts] 05/06: pylint improvements.

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script.

bdrung pushed a commit to branch master
in repository mozilla-devscripts.

commit 4732dae8f2bc34a807abef6ffbab8d28467b08b6
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri May 9 23:40:25 2014 +0200

    pylint improvements.
---
 amo-changelog  | 14 +++++++-------
 install-xpi    |  2 +-
 moz-version    |  2 +-
 moz_version.py |  8 ++++----
 setup.py       |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/amo-changelog b/amo-changelog
index 6a20467..a6c7468 100755
--- a/amo-changelog
+++ b/amo-changelog
@@ -26,21 +26,21 @@ URL_TEMPLATE = "https://addons.mozilla.org/en-US/addon/{ext}/versions/format:rss
 
 
 def main():
-    ap = argparse.ArgumentParser(
+    parser = argparse.ArgumentParser(
         description="fetch Version History of an addon from the Mozilla Extensions website.")
-    ap.add_argument("extension",
-                    help="Extension short-name, as used on addons.mozilla.org.")
-    options = ap.parse_args()
+    parser.add_argument("extension",
+                        help="Extension short-name, as used on addons.mozilla.org.")
+    options = parser.parse_args()
 
     url = URL_TEMPLATE.format(ext=options.extension)
     try:
         fp = urllib2.urlopen(url)
-    except urllib2.HTTPError as e:
-        print("For extension '%s', error fetching '%s': %s" % (options.extension, url, e),
+    except urllib2.HTTPError as error:
+        print("For extension '%s', error fetching '%s': %s" % (options.extension, url, error),
               file=sys.stderr)
         return 1
     try:
-        for event, element in etree.iterparse(fp):
+        for _, element in etree.iterparse(fp):
             if element.tag != "item":
                 continue
             title = element.find("title").text
diff --git a/install-xpi b/install-xpi
index ec0af31..d658735 100755
--- a/install-xpi
+++ b/install-xpi
@@ -263,7 +263,7 @@ def main():
     parser.add_option("-l", "--link", metavar="DIRECTORY",
                       help="link from DIRECTORY to extension directory",
                       dest="links", action="append", default=list())
-    parser.add_option("-p", "--package",  metavar="PACKAGE",
+    parser.add_option("-p", "--package", metavar="PACKAGE",
                       help="install the extension into specified PACKAGE",
                       dest="package", default=None)
     parser.add_option("--preserve-permissions", dest="correct_permissions",
diff --git a/moz-version b/moz-version
index 912501c..b14c7fb 100755
--- a/moz-version
+++ b/moz-version
@@ -149,7 +149,7 @@ def main():
                 print >> sys.stderr, "E: The action --to-moz takes exactly " + \
                                      "one argument."
             sys.exit(COMMAND_LINE_SYNTAX_ERROR)
-        print convert_debian_to_moz_version(args[0], verbose)
+        print convert_debian_to_moz_version(args[0])
 
 if __name__ == "__main__":
     main()
diff --git a/moz_version.py b/moz_version.py
index 04b3cd8..86ed727 100644
--- a/moz_version.py
+++ b/moz_version.py
@@ -25,7 +25,7 @@ def decode_part(part):
     # Split <number-a>
     length = 0
     for i in xrange(len(part)):
-        if part[i].isdigit() or part[i] in ("-"):
+        if part[i].isdigit() or part[i] == "-":
             length += 1
         else:
             break
@@ -36,7 +36,7 @@ def decode_part(part):
     # Split <string-b>
     length = 0
     for i in xrange(len(part)):
-        if not (part[i].isdigit() or part[i] in ("-")):
+        if not (part[i].isdigit() or part[i] == "-"):
             length += 1
         else:
             break
@@ -46,7 +46,7 @@ def decode_part(part):
     # Split <number-c>
     length = 0
     for i in xrange(len(part)):
-        if part[i].isdigit() or part[i] in ("-"):
+        if part[i].isdigit() or part[i] == "-":
             length += 1
         else:
             break
@@ -149,7 +149,7 @@ def _convert_part_to_debian(part):
     return debian_version
 
 
-def convert_debian_to_moz_version(debian_version, verbose=False):
+def convert_debian_to_moz_version(debian_version):
     upstream_version = extract_upstream_version(debian_version)
 
     # compatibility: strip +nobinonly and +build
diff --git a/setup.py b/setup.py
index 0f16dcd..9174109 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ def get_debian_version():
     changelog = "debian/changelog"
     if os.path.exists(changelog):
         head = open(changelog).readline()
-        match = re.compile(".*\((.*)\).*").match(head)
+        match = re.compile(r".*\((.*)\).*").match(head)
         if match:
             version = match.group(1)
     return version

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/mozilla-devscripts.git