Python3 port of ndiff #1807
Closed
Python3 port of ndiff #1807
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BryanQuigley
force-pushed
the
ndiff-python3
branch
5 times, most recently
from
7838418
to
fe8dc17
Compare
|
Would be nice to have for the next release, since Python 2 will be EOL in a couple weeks. |
|
Thanks for porting this @BryanQuigley! Flake8 is flagging the https://docs.python.org/3.6/library/functools.html#functools.cmp_to_key
Line 429 in fe8dc17 Besides that, worked as expected in Python 3.6! import ndiff
filename_a = "test-scans/random-1.xml"
filename_b = "test-scans/random-2.xml"
scan_a = ndiff.Scan()
scan_a.load_from_file(filename_a)
scan_b = ndiff.Scan()
scan_b.load_from_file(filename_b)
# Text
fh = open("text_output.txt", "w")
diff = ndiff.ScanDiffText(scan_a, scan_b, fh)
cost = diff.output()
# XML
fh_xml = open("xml_output.xml", "w")
diff = ndiff.ScanDiffXML(scan_a, scan_b, fh_xml)
cost = diff.output() |
BryanQuigley
force-pushed
the
ndiff-python3
branch
from
fe8dc17
to
f5a4989
Compare
|
Been a bit, but I think we replaced all the cmp bits before this, so removing this last one - seems to work. Thanks for the feedback -also updated because there have been other code commits... |
jefferyto
added a commit
to jefferyto/openwrt-packages
that referenced
this pull request
Mar 20, 2020
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
jefferyto
added a commit
to jefferyto/openwrt-packages
that referenced
this pull request
Mar 21, 2020
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
nunojpg
pushed a commit
to openwrt/packages
that referenced
this pull request
Mar 29, 2020
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Ported all python scrips in ndiff/ except setup.py Some hints on cmp taken from nmap#1484 Minor tweaks to Makefile to support python3, but unsure if there is a better way to do that. Seperated .travis.yml commands for easier debugging where it breaks. This closes the easy half of nmap#1176 Resolves: nmap#1484
BryanQuigley
force-pushed
the
ndiff-python3
branch
from
f5a4989
to
82f8b1a
Compare
farmergreg
pushed a commit
to farmergreg/packages
that referenced
this pull request
Sep 8, 2020
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
farmergreg
pushed a commit
to farmergreg/packages
that referenced
this pull request
Sep 8, 2020
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
hmh
pushed a commit
to simetnicbr/nmap
that referenced
this pull request
Nov 30, 2020
10 tasks
buildroot-auto-update
pushed a commit
to buildroot/buildroot
that referenced
this pull request
Oct 21, 2021
The ndiff package provided by Nmap relies on python2; moreover, there have been pending pull requests to move ndiff to python3 for over two years with very little engagement by the maintainers (nmap/nmap#1807). Remove the option to select ndiff altogether, it is replaced by python-pyndiff, which provides the same functionality (and more) as the ndiff provided by nmap, and is compatible with python3. Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Lienol
pushed a commit
to Lienol/openwrt-packages
that referenced
this pull request
Dec 8, 2021
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Lienol
pushed a commit
to Lienol/openwrt-packages
that referenced
this pull request
Dec 9, 2021
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Lienol
pushed a commit
to Lienol/openwrt-packages
that referenced
this pull request
Dec 19, 2021
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Lienol
pushed a commit
to Lienol/openwrt-packages
that referenced
this pull request
Feb 2, 2022
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Lienol
pushed a commit
to Lienol/openwrt-packages
that referenced
this pull request
Feb 11, 2022
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: nmap/nmap@ea4e2d6 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: nmap/nmap#1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
cclauss
added a commit
to cclauss/nmap
that referenced
this pull request
Nov 7, 2022
cclauss
added a commit
to cclauss/nmap
that referenced
this pull request
Nov 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ports everything except for setup.py