commit: 69cba480c48a85602263bb2f7d2398d78b0240e2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Dec 26 08:38:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Dec 26 10:19:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cba480
net-analyzer/nmap: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28822 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nmap/files/nmap-9999-python3.patch | 103 ------------------------ 1 file changed, 103 deletions(-) diff --git a/net-analyzer/nmap/files/nmap-9999-python3.patch b/net-analyzer/nmap/files/nmap-9999-python3.patch deleted file mode 100644 index 3d740d759b3c..000000000000 --- a/net-analyzer/nmap/files/nmap-9999-python3.patch +++ /dev/null @@ -1,103 +0,0 @@ -https://github.com/nmap/nmap/pull/2580 - -From 14f8e230a61748b1cde86d13a2cf2353d7ad1fa7 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Fri, 9 Dec 2022 15:58:35 +0000 -Subject: [PATCH] zenmap: further Python 3 compatibility fixes - -Without this, we get: -``` -Traceback (most recent call last): - File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 584, in <module> - setup(**setup_args) - File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 185, in setup - return run_commands(dist) - File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 201, in run_commands - dist.run_commands() - File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 969, in run_commands - self.run_command(cmd) - File "/usr/lib/python3.10/site-packages/setuptools/dist.py", line 1208, in run_command - super().run_command(command) - File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 988, in run_command - cmd_obj.run() - File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 188, in run - self.write_installed_files() - File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 419, in write_installed_files - print >> f, output -TypeError: unsupported operand type(s) for >>: 'builtin_function_or_method' and '_io.TextIOWrapper'. Did you mean "print(<message>, file=<output_stream>)"? -make: *** [Makefile:372: install-zenmap] Error 1 -``` - -This is because Python 3 doesn't support Python 2-style print without -parentheses, or specifying the output file in that manner. - -Signed-off-by: Sam James <[email protected]> ---- a/zenmap/setup.py -+++ b/zenmap/setup.py -@@ -215,13 +215,13 @@ def create_uninstaller(self): - #!/usr/bin/env python3 - import errno, os, os.path, sys - --print 'Uninstall %(name)s %(version)s' -+print('Uninstall %(name)s %(version)s') - - answer = raw_input('Are you sure that you want to uninstall ' - '%(name)s %(version)s? (yes/no) ') - - if answer != 'yes' and answer != 'y': -- print 'Not uninstalling.' -+ print('Not uninstalling.') - sys.exit(0) - - """ % {'name': APP_DISPLAY_NAME, 'version': VERSION} -@@ -237,8 +237,8 @@ def create_uninstaller(self): - # This should never happen (everything gets installed - # inside the root), but if it does, be safe and don't - # delete anything. -- uninstaller += ("print '%s was not installed inside " -- "the root %s; skipping.'\n" % (output, self.root)) -+ uninstaller += ("print('%s was not installed inside " -+ "the root %s; skipping.')\n" % (output, self.root)) - continue - output = path_strip_prefix(output, self.root) - assert os.path.isabs(output) -@@ -262,24 +262,24 @@ def create_uninstaller(self): - dirs.append(path) - # Delete the files. - for file in files: -- print "Removing '%s'." % file -+ print("Removing '%s'." % file) - try: - os.remove(file) - except OSError as e: -- print >> sys.stderr, ' Error: %s.' % str(e) -+ print(' Error: %s.' % str(e), file=sys.stderr) - # Delete the directories. First reverse-sort the normalized paths by - # length so that child directories are deleted before their parents. - dirs = [os.path.normpath(dir) for dir in dirs] - dirs.sort(key = len, reverse = True) - for dir in dirs: - try: -- print "Removing the directory '%s'." % dir -+ print("Removing the directory '%s'." % dir) - os.rmdir(dir) - except OSError as e: - if e.errno == errno.ENOTEMPTY: -- print "Directory '%s' not empty; not removing." % dir -+ print("Directory '%s' not empty; not removing." % dir) - else: -- print >> sys.stderr, str(e) -+ print(str(e), file=sys.stderr) - """ - - uninstaller_file = open(uninstaller_filename, 'w') -@@ -419,7 +419,7 @@ def write_installed_files(self): - with open(INSTALLED_FILES_NAME, "w") as f: - for output in self.get_installed_files(): - assert "\n" not in output -- print >> f, output -+ print(output, file=f) - - - class my_uninstall(Command): -
