use flake8

Author: Vladimir Kotal

opengrok-indexer/pom.xml

@@ -463,7 +463,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                   </execution>
                 </executions>
                 <configuration>
-                  <executable>pep8</executable>
+                  <executable>flake8</executable>
                   <arguments>
 		    <argument>-v</argument>
 		    <argument>--exclude=filelock.py,test_command.py,test_commands.py</argument>

scripts/before_install

@@ -1,10 +1,14 @@
 #!/bin/bash
 
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-	sudo apt-get install -qq exuberant-ctags cvs git mercurial cssc bzr subversion monotone rcs pep8;
+	sudo apt-get update -qq
+	sudo apt-get install -qq exuberant-ctags cvs git mercurial cssc bzr subversion monotone rcs python3 python3-pip pep8;
+	sudo ./scripts/install-bitkeeper.sh
+	sudo pip3 install --upgrade pip
+	sudo pip3 install flake8
+elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+	brew update
+	brew install ctags cvs
+	brew upgrade python
+	pip3 install pep8 flake8
 fi
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ./scripts/install-bitkeeper.sh; fi
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ctags cvs; fi
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install pep8; fi

tools/command.py

@@ -24,7 +24,6 @@
 import os
 import logging
 import subprocess
-import string
 import threading
 import time
 import resource

tools/commands.py

@@ -22,8 +22,6 @@
 #
 
 import logging
-import os
-import command
 from command import Command
 from opengrok import put, post, delete
 from utils import is_web_uri

tools/deploy.py

@@ -25,11 +25,10 @@
 import os
 import sys
 import argparse
-from utils import get_command, is_exe
+from utils import get_command
 from command import Command
-import string
 import tempfile
-from shutil import copyfile, rmtree
+from shutil import copyfile
 import logging
 
 
@@ -57,7 +56,7 @@ def repack_war(logger, sourceWar, targetWar, configFile, defaultConfigFile):
         if not unzip_cmd:
             raise "unzip not found"
 
-        extract_cmd = [unzip]
+        extract_cmd = [unzip_cmd]
         compress_cmd = [zip_cmd, '-rf']
 
     # Resolve the full path. This is needed if sourceWar is specified as

tools/hook.py

@@ -21,9 +21,7 @@
 # Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 #
 
-import os
 from command import Command
-import logging
 
 
 def run_hook(logger, script, path, env, timeout):

tools/indexer.py

@@ -25,12 +25,8 @@
 import os
 import sys
 import argparse
-from utils import get_command, is_exe
+from utils import get_command
 from command import Command
-import string
-import tempfile
-from shutil import copyfile, rmtree
-import platform
 from java import Java, get_javaparser
 import logging
 

tools/mirror.py

@@ -31,27 +31,18 @@
 
 
 import argparse
-import subprocess
-import time
 import os
 import sys
-from os import path
 import filelock
 from filelock import Timeout
-import command
-from command import Command
 import logging
 from logging.handlers import RotatingFileHandler
 import tempfile
-import commands
-from repository import Repository
-from mercurial import MercurialRepository
 from repofactory import get_repository
 from utils import is_exe, check_create_dir, get_int, diff_list
 from hook import run_hook
 from readconfig import read_config
 from opengrok import get_repos, get_config_value, get_repo_type
-from shutil import which
 import re
 
 
@@ -113,7 +104,7 @@
     # Make sure the log directory exists.
     logdir = config.get("logdir")
     if logdir:
-        check_create_dir(logdir)
+        check_create_dir(logger, logdir)
 
     uri = args.uri
     if not uri:

tools/opengrok.py

@@ -21,7 +21,6 @@
 # Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 #
 
-import logging
 import requests
 import urllib.parse
 import traceback
@@ -32,7 +31,7 @@ def get(logger, uri, params=None, headers=None):
     try:
         proxies = get_proxies(uri)
         return requests.get(uri, params=params, proxies=proxies)
-    except Exception as e:
+    except Exception:
         logger.debug(traceback.format_exc())
         return None
 
@@ -41,7 +40,7 @@ def delete(logger, uri, params=None, headers=None):
     try:
         proxies = get_proxies(uri)
         return requests.delete(uri, params=params, proxies=proxies)
-    except Exception as e:
+    except Exception:
         logger.debug(traceback.format_exc())
         return None
 
@@ -51,7 +50,7 @@ def post(logger, uri, headers=None, data=None):
     try:
         proxies = get_proxies(uri)
         rv = requests.post(uri, data=data, headers=headers, proxies=proxies)
-    except Exception as e:
+    except Exception:
         logger.debug(traceback.format_exc())
         return None
 
@@ -63,7 +62,7 @@ def put(logger, uri, headers=None, data=None):
     try:
         proxies = get_proxies(uri)
         rv = requests.put(uri, data=data, headers=headers, proxies=proxies)
-    except Exception as e:
+    except Exception:
         logger.debug(traceback.format_exc())
         return None
 

tools/readconfig.py

@@ -43,7 +43,7 @@ def read_config(logger, inputfile):
             try:
                 logger.debug("trying JSON")
                 cfg = json.loads(data)
-            except:
+            except json.decoder.JSONDecodeError:
                 # Not a valid JSON file.
                 logger.debug("got exception {}".format(sys.exc_info()[0]))
                 pass
@@ -53,13 +53,13 @@ def read_config(logger, inputfile):
             try:
                 logger.debug("trying YAML")
                 cfg = yaml.load(data)
-            except:
+            except AttributeError:
                 # Not a valid YAML file.
                 logger.debug("got exception {}".format(sys.exc_info()[0]))
                 pass
             else:
                 return cfg
-    except IOError as e:
+    except IOError:
         logger.error("cannot open '{}'".format(inputfile))
 
     return cfg