1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-04 04:26:33 +00:00
Commit Graph

85 Commits

Author SHA1 Message Date
dmiller
5c662fffdc Apply PEP 8 style guidance to zenmap
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)
2014-01-08 19:50:22 +00:00
dmiller
7e521bcc4f Remove unecessary circular import from radialnet.util.misc 2014-01-07 20:03:46 +00:00
dmiller
0c995f95d8 Add missing make_graph_from_nmap_parser needed by some unittests 2014-01-07 20:03:44 +00:00
dmiller
dc0f5b592e Fix incorrect invocation of NmapParser in NetworkInventory.open_from_file 2013-12-20 22:13:28 +00:00
jah
66efa2840a Update zenmap/setup.py WINDOWS_SETUP_ARGS with the recently changed (in r32435)
path to ndiff/scripts/ndiff.
2013-11-27 23:17:30 +00:00
david
58e5885f17 Remove libxml2.2.dylib from the OS X application bundle.
This file is automatically copied into the bundle by py2app. It is
already present as a system library on OS X 10.6 and later. Shipping our
own caused a compatibility problem on OS X 10.9:

Could not import the zenmapGUI.App module: 'dlopen(/Applications/Zenmap.app/Contents/Resources/lib/python2.6/lib-dynload/glib/_glib.so, 2): Symbol not found: _xmlBufContent\n  Referenced from: /usr/lib/libxslt.1.dylib\n  Expected in: /Applications/Zenmap.app/Contents/Frameworks/libxml2.2.dylib\n in /usr/lib/libxslt.1.dylib'.

http://seclists.org/nmap-dev/2013/q4/85
2013-11-12 04:04:45 +00:00
dmiller
00798ff53b Remove deprecated BaseException.message in favor of unicode(e) 2013-10-28 18:49:53 +00:00
d33tah
ccd0c02a4c Add a lacking space in the license comment. The command I used to do this is:
for file in `grep "* including the terms and conditions of this license text as well.       \*" * -r --files-with-match `; do sed "s/\* including the terms and conditions of this license text as well.       \*/* including the terms and conditions of this license text as well.        */g" -i $file; done
2013-09-11 19:06:20 +00:00
david
4035012050 Remove the "" entry from search_keywords.
Having this entry made it appear as if there was a search criterion
named for the empty string; i.e., a string like ":foobar" would be
parsed as an operator "" with an argument "foobar". There was no match
function defined for the empty string, which led to this crash:

Version: 6.25
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/zenmapGUI/ScanInterface.py", line 247, in filter_hosts
    self.inventory.apply_filter(filter_string)
  File "/usr/lib/python2.7/dist-packages/zenmapCore/NetworkInventory.py", line 502, in apply_filter
    if not self._match_all_args(host, operator, args):
  File "/usr/lib/python2.7/dist-packages/zenmapCore/NetworkInventory.py", line 452, in _match_all_args
    if positive != self.__getattribute__("match_%s" % operator)(host, arg):
AttributeError: 'FilteredNetworkInventory' object has no attribute 'match_'

I did some quick tests and plain keyword searching (with no colon) seems
to still work. I'm not sure why the "" entry was ever present.

Reported by Kris Paernell.
http://seclists.org/nmap-dev/2013/q3/38
2013-07-31 21:12:51 +00:00
fyodor
6e01ecd452 Update an email address, fix a typo, and slightly reword a sentence. 2013-07-30 00:02:00 +00:00
fyodor
b01fd55cb6 Change version number to 6.41SVN and regenerate auto-generated files such as man page, script.db, etc. 2013-07-29 06:00:07 +00:00
david
5db8c41f9c Put ru.po Plural-Forms on a single line.
Having this on two lines apparently uncovers a bug in some versions of
Python gettext. A Zenmap crash was reported by Дмитрий Никитич.

http://seclists.org/nmap-dev/2013/q2/525

http://bugs.python.org/issue1448060
https://bugzilla.redhat.com/show_bug.cgi?id=252136
2013-07-27 01:59:21 +00:00
david
ec3536d31a Remove executable mode. 2013-06-21 23:13:51 +00:00
david
8ff10edd1c pl.po update from Jacek Wielemborek. 2013-05-17 15:08:47 +00:00
david
db621362cb Add pl .mo. 2013-05-14 18:11:46 +00:00
david
a5134555c6 Add Polish translation by Jacek Wielemborek.
http://seclists.org/nmap-dev/2013/q2/292
2013-05-14 18:11:44 +00:00
david
3f3bb4a546 Regen po files.
Recommitted after recovery from backup.
2013-04-12 17:29:35 +00:00
david
87bbbfa0e4 Regen zenmap.pot.
Recommitted after recovery from backup.
2013-04-12 17:29:33 +00:00
david
24f378acdb Regen it translation mo.
Recommitted after recovery from backup.
2013-04-12 17:29:31 +00:00
david
fac98776b7 Update Zenmap it.po translation.
By Giacomo.
http://seclists.org/nmap-dev/2013/q2/0

Recommitted after recovery from backup.
2013-04-12 17:29:29 +00:00
david
797689c920 Regenerate it.po with new msgmerge.
Recommitted after recovery from backup.
2013-04-12 17:29:13 +00:00
david
e85fceacce Update zenmap.pot.
Recommitted after recovery from backup.
2013-04-12 17:29:11 +00:00
dmiller
c4c197b213 Fix @arg nsedoc parsing in Zenmap
Zenmap was only showing the first line of @arg nsedoc entries, since it
was capturing the contents with a regular expression, which ends at the
first newline. Fixed by simply returning the entire contents with the
first word (the name of the arg) stripped off.
2013-03-29 20:44:33 +00:00
david
11ba3ef045 Check NMAP_PRIVILEGED and NMAP_UNPRIVILEGED in Zenmap is_root.
You won't get the "you're not root" dialog if NMAP_PRIVILEGED is set.
Patch by Tyler Wagner.
http://seclists.org/nmap-dev/2013/q1/87
2013-01-24 17:18:13 +00:00
david
948b3e9bcd Regen .mo files.
This fixes a search-and-replace in r30347 that broke these binary files.
Discovered by eric c4rtman.
http://seclists.org/nmap-dev/2013/q1/53
2013-01-20 11:34:53 +00:00
david
b44d477344 Comment typo. 2013-01-04 18:59:44 +00:00
david
f86b575aa1 Remove -q (quash argv to "pine" option). 2013-01-04 18:59:11 +00:00
david
70ac55c67b Comment typo. 2012-12-11 03:03:18 +00:00
david
e4c94bf4ff Fix an About dialog–related crash.
When the dialog is closed by the user clicking the X, rather than a
button in the dialog, the dialog doesn't exist anymore, so we can't
simply hide and later re-present it.
2012-12-11 03:03:17 +00:00
dmiller
f5d999efaf Change su-to-zenmap.sh from bash to sh script 2012-12-06 18:54:36 +00:00
david
ec53dc049a Update with new mailing list addresses. 2012-12-06 02:23:34 +00:00
fyodor
6a42ef47c0 Update the Nmap and Nsock source code headers to note new Nmap dev mailing list email address and a better URL for Nmap license. 2012-12-06 01:21:42 +00:00
fyodor
e09125e010 Update CHANGELOG to note 6.25 release and also bumped up Nmap SVN version number to avoid confusion and rebuilt files accordingly 2012-11-29 23:40:26 +00:00
david
d662ef817b Don't hack_xinitrc if system xinitrc doesn't exist. 2012-11-29 20:49:47 +00:00
david
aa25518d95 Ignore a GError from printing.
This strange error happens when canceling a "Print to File" operation on
Windows:

Traceback (most recent call last):
  File "zenmapGUI\MainWindow.pyo", line 831, in _print_cb
  File "zenmapGUI\Print.pyo", line 156, in run_print_operation
GError: Error from StartDoc

The web seems mostly silent on this error, and I can't guess at the
cause. Let's ignore the error as it seems to be harmless.

Reported by Imre Adácsi.
http://seclists.org/nmap-dev/2012/q4/161
2012-11-22 04:39:32 +00:00
fyodor
ea05ae2586 Latest auto-generated files in prep for upcoming 6.20BETA1 release 2012-11-16 00:54:16 +00:00
david
e8b5fb974f Fix typos in the jp translation.
Patch by OKANO Takayoshi.
http://seclists.org/nmap-dev/2012/q4/87
2012-10-11 16:10:41 +00:00
david
b8e44155da Python is now in nmap-mswin32-aux. 2012-10-03 05:18:23 +00:00
dmiller
0c1fd3e9d9 Make all host filters case-insensitive
Also some cleanup of unused variables, other minor performance tweaks.
2012-09-13 20:24:19 +00:00
dmiller
74a750a855 Allow negative matching in Zenmap filters
nmap-dev thread: http://seclists.org/nmap-dev/2012/q3/788

Host filter and others can now take things like "os:!linux" to match
hosts without Linux OS.
2012-09-13 20:24:18 +00:00
david
f66691ee08 Remove some ancient commented SearchResult test code. 2012-09-12 21:51:48 +00:00
david
a47d68a84f Typo. 2012-09-10 23:53:54 +00:00
david
303de03813 Apple broke the link to their icons doc. 2012-09-10 23:52:20 +00:00
david
690851ba2e Make a 512×512 OS X icon for Zenmap. 2012-09-10 23:50:16 +00:00
david
94959c42e2 Use the -c option in kdesu commands.
This bug was found by Gaetan Bisson.
http://seclists.org/nmap-dev/2012/q3/592.
2012-08-19 20:11:06 +00:00
sean
b13bd155ab Updated the resolution of the zenmap.png file so that it will look better on modern desktops. 2012-08-05 19:48:15 +00:00
sean
ff9e6e52b9 Updated the windows install icons. Added new sizes and resolutions following theinstructions here http://msdn.microsoft.com/en-us/library/windows/desktop/aa511280.aspx 2012-08-02 01:30:01 +00:00
david
20742bdde0 Ignore failure of locale.getdefaultlocale.
This was reported to be a problem with the en_NG (Nigerian English)
locale by Kayode Adesina and Olisemeka Omo.

http://seclists.org/nmap-dev/2012/q2/965
http://seclists.org/nmap-dev/2012/q3/270

The underlying Python bug is this:

http://bugs.python.org/issue6895
2012-07-20 01:55:25 +00:00
david
bd526768c8 Update MacPorts-ports.diff. 2012-07-18 00:00:17 +00:00
david
feea11ed24 Catch an exception that happens while aggregating a new scan. 2012-06-21 00:56:55 +00:00