Travis: Use flake8 and correct flake8 warnings.

bamos · bamos · commit acc7e0b3366c · 2016-01-01T21:51:50.000-05:00
diff --git a/.travis-script-2.sh b/.travis-script-2.sh
@@ -5,5 +5,5 @@ set -x -e # Show commands being executed and exit nonzero upon errors.
 ./python2.7/mt.py --help
 
 for F in python2.7/*; do
-  pep8 --ignore=E402,E501 $F
+  flake8 --ignore=E402,E501 $F
 done
diff --git a/.travis-script-3.sh b/.travis-script-3.sh
@@ -13,5 +13,5 @@ set -x -e # Show commands being executed and exit nonzero upon errors.
 ./python3/merge-mutt-contacts.py --help
 
 for F in generate-readme.py python3/*; do
-  pep8 --ignore=E402,E501 $F
+  flake8 --ignore=E402,E501 $F
 done
diff --git a/python2.7/caffe-compute-image-mean.py b/python2.7/caffe-compute-image-mean.py
@@ -15,7 +15,6 @@
 import os
 import time
 
-from caffe.proto import caffe_pb2
 from caffe.io import array_to_blobproto
 from collections import defaultdict
 from skimage import io
diff --git a/python2.7/fix-music-tags.py b/python2.7/fix-music-tags.py
@@ -14,9 +14,6 @@
 
 def fixTags(fname, keep):
     audio = EasyID3(fname)
-    artist = audio['artist']
-    title = audio['title']
-    album = audio['album']
 
     delKeys = []
     for k, v in audio.items():
diff --git a/python3/github-repo-summary.py b/python3/github-repo-summary.py
@@ -9,7 +9,6 @@
 
 from github import Github
 import argparse
-import time
 import os
 import sys
 
@@ -30,8 +29,7 @@ def sanitize_for_md(s):
     try:
         r = github.get_repo(r_name)
     except:
-        print("Error: Repository '{}' not found.".format(r_name),
-              file=sys.stderr)
+        sys.stderr.write("Error: Repository '{}' not found.\n".format(r_name))
         sys.exit(-1)
     content = " | ".join([
         "[{}]({})".format(r.full_name, r.html_url),
diff --git a/python3/link-checker.py b/python3/link-checker.py
@@ -21,11 +21,11 @@
 # Settings to send emails with SMTP with gmail.
 server = "smtp.gmail.com"
 port = 587
-user = ENTER_USER
-pw = ENTER_PW  # Please use an application-specific password for security!
-email_to = ENTER_TO_EMAIL
-email_from = ENTER_FROM_EMAIL
-root_url = ENTER_URL
+user = 'ENTER_USER'
+pw = 'ENTER_PW'  # Please use an application-specific password for security!
+email_to = 'ENTER_TO_EMAIL'
+email_from = 'ENTER_FROM_EMAIL'
+root_url = 'ENTER_URL'
 
 cmd = ["linkchecker", "--no-warnings", "--no-status", "--external", root_url]
 output = Popen(cmd, stdout=PIPE).communicate()[0].decode("UTF-8")
diff --git a/python3/merge-pdfs-printable.py b/python3/merge-pdfs-printable.py
@@ -37,7 +37,6 @@
 
 import argparse
 import os
-import re
 import subprocess
 import tempfile
 
@@ -87,7 +86,7 @@ def merge_pdfs(f_names):
     out_file = "merged.pdf"  # tempfile.mktemp("-merge.pdf")
     with open(out_file, 'wb') as f:
         merger.write(f)
-    [f.close() for f in fps]
+    [fp.close() for fp in fps]
     print("Merged output is in '{}'.".format(out_file))
 
 if __name__ == '__main__':
diff --git a/python3/remove-duplicates.py b/python3/remove-duplicates.py
@@ -13,7 +13,6 @@
 import hashlib
 import imagehash
 import os
-import sys
 
 from collections import defaultdict
 from PIL import Image
@@ -27,7 +26,8 @@ def getImgs(d):
     for subdir, dirs, files in os.walk(d):
         imgs = []
         for fName in files:
-            (imageClass, imageName) = (os.path.basename(subdir), fName)
+            # (imageClass, imageName) = (os.path.basename(subdir), fName)
+            imageName = fName
             if any(imageName.lower().endswith("." + ext) for ext in exts):
                 imgs.append(os.path.join(subdir, fName))
         imgClasses.append(imgs)
