PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00
Code Issues Projects Releases Wiki Activity

Apply PEP 8 style guidance to zenmap

Browse Source 
Using the pep8 tool (https://pypi.python.org/pypi/pep8), fixed the
following style issues:

Count   Issue
11      E201 whitespace after '['
8       E203 whitespace before ','
41      E211 whitespace before '('
11      E221 multiple spaces before operator
61      E225 missing whitespace around operator
237     E231 missing whitespace after ':'
91      E251 no spaces around keyword / parameter equals
19      E261 at least two spaces before inline comment
41      E301 expected 1 blank line, found 0
200     E302 expected 2 blank lines, found 1
356     E303 too many blank lines (2)
563     E501 line too long (106 characters)
39      E701 multiple statements on one line (colon)
13      E702 multiple statements on one line (semicolon)
4       W291 trailing whitespace
2       W293 blank line contains whitespace
8       W391 blank line at end of file
21      W601 .has_key() is deprecated, use 'in'
2       W602 deprecated form of raising exception

The remaining issues are long lines due to very deep data structures. I
chose not to alter them, as it would involve backslash-continuation
where whitespace is not permitted:

./zenmapGUI/ScanInterface.py:323:80: E501 line too long (90 characters)
./zenmapGUI/ScanInterface.py:456:80: E501 line too long (84 characters)
./zenmapGUI/ScanInterface.py:464:80: E501 line too long (84 characters)
./zenmapGUI/ScanInterface.py:472:80: E501 line too long (122 characters)
./zenmapGUI/ScanInterface.py:479:80: E501 line too long (122 characters)
./zenmapGUI/ScanInterface.py:920:80: E501 line too long (94 characters)
./zenmapGUI/ScanInterface.py:923:80: E501 line too long (93 characters)
./zenmapGUI/MainWindow.py:575:80: E501 line too long (99 characters)
./zenmapGUI/MainWindow.py:906:80: E501 line too long (99 characters)
This commit is contained in:
dmiller
2014-01-08 19:50:22 +00:00
parent 9210a7f1fa
commit 5c662fffdc
100 changed files with 2287 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
zenmap/zenmapCore/BasePaths.py
View File

@@ -126,6 +126,7 @@ import sys
from zenmapCore.Name import APP_NAME
def fs_dec(s):
"""Decode s from the filesystem decoding, handling various possible
errors."""
@@ -134,6 +135,7 @@ def fs_dec(s):
enc = "UTF-8"
return s.decode(enc)
def fs_enc(u):
"""Encode u to the filesystem decoding, handling various possible
errors."""
@@ -146,20 +148,20 @@ def fs_enc(u):
# home directory, because os.path.expanduser doesn't properly decode the raw
# byte string from the file system encoding. You get a UnicodeDecodeError on
# systems like Windows where the file system encoding is different from the
# result of sys.getdefaultencoding(). So we call os.path.expanduser with a plain
# string and decode it from the filesystem encoding.
# result of sys.getdefaultencoding(). So we call os.path.expanduser with a
# plain string and decode it from the filesystem encoding.
HOME = fs_dec(os.path.expanduser("~"))
# The base_paths dict in this file gives symbolic names to various files. For
# example, use base_paths.target_list instead of 'target_list.txt'.
base_paths = dict(user_config_file = APP_NAME + '.conf',
user_config_dir = os.path.join(HOME, '.' + APP_NAME),
scan_profile = 'scan_profile.usp',
profile_editor = 'profile_editor.xml',
recent_scans = 'recent_scans.txt',
target_list = 'target_list.txt',
options = 'options.xml',
user_home = HOME,
db = APP_NAME + ".db",
version = APP_NAME + "_version")
base_paths = dict(user_config_file=APP_NAME + '.conf',
user_config_dir=os.path.join(HOME, '.' + APP_NAME),
scan_profile='scan_profile.usp',
profile_editor='profile_editor.xml',
recent_scans='recent_scans.txt',
target_list='target_list.txt',
options='options.xml',
user_home=HOME,
db=APP_NAME + ".db",
version=APP_NAME + "_version")