Skip to content

Commit

Permalink
Merge pull request #1254 from gyorb/dev-pycodestyle
Browse files Browse the repository at this point in the history
use pycodestyle instead of pep8
  • Loading branch information
csordasmarton authored Dec 14, 2017
2 parents bac5ab8 + 39ee029 commit 9bf5470
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then createuser -s postgres; fi

install:
- pip install nose pep8
- pip install nose pycodestyle
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install virtualenv; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cat postgres.log; fi

Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ Contribution guidelines

Python style
------------
In CodeChecker, we use the [PEP-8](https://www.python.org/dev/peps/pep-0008)
rules in our coding style. _PEP-8_ is enforced by the test infrastructure
– if you write a new module outside the current directory structure,
In CodeChecker, we use [pycodestyle](https://pypi.python.org/pypi/pycodestyle/)
to automatically check our coding style. `pycodestyle` is enforced by the test
infrastructure – if you write a new module outside the current directory structure,
make sure to add its path to [`tests/Makefile`](`tests/Makefile`) under the
`pep8` target.
`pycodestyle` target.

In addition to the general rules of _PEP-8_, please keep the following rules
In addition to the general rules of `pycodestyle`, please keep the following rules
while writing your code:

* Comments must be whole sentences, beginning with a capital letter and
Expand Down
6 changes: 3 additions & 3 deletions libcodechecker/analyze/analyzer_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def get_log_env(logfile, context, original_env):
original_ld_library_path = new_env['LD_LIBRARY_PATH']
new_env['LD_LIBRARY_PATH'] = context.path_logger_lib + ':' + \
original_ld_library_path
except:
except KeyError:
new_env['LD_LIBRARY_PATH'] = context.path_logger_lib

# Set ld logger logfile.
Expand All @@ -52,7 +52,7 @@ def get_check_env(path_env_extra, ld_lib_path_extra):

try:
new_env['PATH'] = extra_path + ':' + new_env['PATH']
except:
except KeyError:
new_env['PATH'] = extra_path

if len(ld_lib_path_extra) > 0:
Expand All @@ -64,7 +64,7 @@ def get_check_env(path_env_extra, ld_lib_path_extra):
original_ld_library_path = new_env['LD_LIBRARY_PATH']
new_env['LD_LIBRARY_PATH'] = \
extra_lib + ':' + original_ld_library_path
except:
except KeyError:
new_env['LD_LIBRARY_PATH'] = extra_lib

return new_env
Expand Down
4 changes: 2 additions & 2 deletions libcodechecker/libauth/cc_ldap.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ def __init__(self, ldap_config, who=None, cred=None):
LOG.debug(who)
res = self.connection.simple_bind_s(who, cred)
LOG.debug(res)
except:
except Exception:
LOG.debug("Server bind failed.")
if self.connection is not None:
self.connection.unbind()
Expand Down Expand Up @@ -397,6 +397,6 @@ def get_groups(ldap_config, username, credentials):
LOG.debug("groups:")
LOG.debug(groups)
return groups
except:
except Exception:
LOG.error("Cannot get ldap groups for user: " + username)
return []
4 changes: 2 additions & 2 deletions libcodechecker/libclient/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def setup_auth_client_from_url(product_url, session_token=None):
try:
protocol, host, port, _ = split_product_url(product_url)
return setup_auth_client(protocol, host, port, session_token)
except:
except ValueError:
LOG.error("Malformed product URL was provided. A valid product URL "
"looks like this: 'http://my.server.com:80/ProductName'.")
sys.exit(2) # 2 for argument error.
Expand Down Expand Up @@ -236,7 +236,7 @@ def setup_client(product_url, product_client=False):

try:
protocol, host, port, product_name = split_product_url(product_url)
except:
except ValueError:
LOG.error("Malformed product URL was provided. A valid product URL "
"looks like this: 'http://my.server.com:80/ProductName'.")
sys.exit(2) # 2 for argument error.
Expand Down
2 changes: 1 addition & 1 deletion libcodechecker/libhandlers/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def __instance_management(args):
LOG.info("Stopped CodeChecker server running on port {0} "
"in workspace {1} (PID: {2})".
format(i['port'], i['workspace'], i['pid']))
except:
except Exception:
# Let the exception come out if the commands fail
LOG.error("Couldn't stop process PID #" + str(i['pid']))
raise
Expand Down
1 change: 1 addition & 0 deletions libcodechecker/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def add_verbose_arguments(parser):
default='info',
help='Set verbosity level.')


DEBUG_ANALYZER = logging.DEBUG_ANALYZER = 15
logging.addLevelName(DEBUG_ANALYZER, 'DEBUG_ANALYZER')

Expand Down
2 changes: 1 addition & 1 deletion libcodechecker/server/api/report_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def unzip(b64zip, output_dir):
with zipfile.ZipFile(zip_file, 'r', allowZip64=True) as zipf:
try:
zipf.extractall(output_dir)
except:
except Exception:
LOG.error("Failed to extract received ZIP.")
import traceback
traceback.print_exc()
Expand Down
1 change: 1 addition & 0 deletions libcodechecker/server/database/config_db_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def __init__(self, permission, product_id, name, is_group=False):
self.name = name
self.is_group = is_group


IDENTIFIER = {
'identifier': "ConfigDatabase",
'orm_meta': CC_META,
Expand Down
2 changes: 1 addition & 1 deletion libcodechecker/server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ def start_server(config_directory, package_data, port, db_conn_string,
with open(root_file, 'r') as f:
root_sha = f.read()
LOG.debug("Root digest is '{0}'".format(root_sha))
except:
except IOError:
LOG.info("Cannot open root file '{0}' even though it exists"
.format(root_file))
root_sha = __make_root_file(root_file)
Expand Down
4 changes: 2 additions & 2 deletions libcodechecker/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def split_server_url(url):
else:
raise ValueError("The server's address is not in a valid "
"'host:port' format!")
except:
except Exception:
raise ValueError("The specified server URL is invalid.")

LOG.debug("Result: With '{0}' on server '{1}:{2}'"
Expand Down Expand Up @@ -317,7 +317,7 @@ def split_product_url(url):
"'host:port' format!")
else:
raise ValueError("Product URL can not contain extra '/' chars.")
except:
except Exception:
raise ValueError("The specified product URL is invalid.")

LOG.debug("Result: With '{0}' on server '{1}:{2}', product '{3}'"
Expand Down
1 change: 1 addition & 0 deletions scripts/create_new_subcommand.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,6 @@ def main():
print(" * " + handler_file)
print(" * " + os.path.join(lib_dir, lib_name))


if __name__ == "__main__":
main()
14 changes: 7 additions & 7 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ CLEAR_WORKSPACE_CMD = rm -rf $(BUILD_DIR)/workspace
# Nose test runner configuration options.
NOSECFG = --config .noserc

test: pep8 test_unit test_functional test_build_logger
test: pycodestyle test_unit test_functional test_build_logger

test_novenv: pep8 test_unit_novenv test_functional_novenv
test_novenv: pycodestyle test_unit_novenv test_functional_novenv

pep8:
pep8 bin libcodechecker scripts tests vendor/plist_to_html
pycodestyle:
pycodestyle bin libcodechecker scripts tests vendor/plist_to_html

UNIT_TEST_CMD = nosetests $(NOSECFG) tests/unit

Expand Down Expand Up @@ -112,13 +112,13 @@ test_clean:

# Use the proper requirement file for the given test configuration
test_matrix_sqlite: VENV_DEV_REQ_FILE = .ci/basic_python_requirements
test_matrix_sqlite: pep8 test_unit test_sqlite
test_matrix_sqlite: pycodestyle test_unit test_sqlite

test_matrix_psql_psycopg2: VENV_DEV_REQ_FILE = .ci/python_requirements_psql_psycopg2
test_matrix_psql_psycopg2: pep8 test_unit test_psql_psycopg2
test_matrix_psql_psycopg2: pycodestyle test_unit test_psql_psycopg2

test_matrix_psql_pg8000: VENV_DEV_REQ_FILE = .ci/python_requirements_psql_pg8000
test_matrix_psql_pg8000: pep8 test_unit test_psql_pg8000
test_matrix_psql_pg8000: pycodestyle test_unit test_psql_pg8000

clean_travis:
# Clean CodeChecker config files stored in the users home directory.
Expand Down
1 change: 1 addition & 0 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
nose
pycodestyle

0 comments on commit 9bf5470

Please sign in to comment.