diff --git a/zenmap/share/zenmap/locale/de.po b/zenmap/share/zenmap/locale/de.po index 1661d7185..81ccbec27 100644 --- a/zenmap/share/zenmap/locale/de.po +++ b/zenmap/share/zenmap/locale/de.po @@ -85,10 +85,6 @@ msgstr "" "erhöht den Umfang der Ausgabe. Dies kann mehrfach benutzt werden, um den " "Umfang weiter zu erhöhen." -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Python 2.4 oder aktueller ist erforderlich." - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/es.po b/zenmap/share/zenmap/locale/es.po index 659fdef44..b01008f04 100644 --- a/zenmap/share/zenmap/locale/es.po +++ b/zenmap/share/zenmap/locale/es.po @@ -88,10 +88,6 @@ msgstr "" "Aumenta la verbosidad de la salida. Puede ser utilizado más de una vez para " "obtener aún más verbosidad" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Es necesario Python 2.4 o una versión más reciente." - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/fr.po b/zenmap/share/zenmap/locale/fr.po index dc99e1051..25ee5b88e 100644 --- a/zenmap/share/zenmap/locale/fr.po +++ b/zenmap/share/zenmap/locale/fr.po @@ -89,10 +89,6 @@ msgstr "" "Augmente le nombre de messages informatifs. Peut être utilisé plus d'une " "fois pour avoir encore plus d'informations" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Python 2.4 ou plus récent est requis." - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/hi.po b/zenmap/share/zenmap/locale/hi.po index 97a41974a..ae0e2dd4a 100644 --- a/zenmap/share/zenmap/locale/hi.po +++ b/zenmap/share/zenmap/locale/hi.po @@ -79,10 +79,6 @@ msgid "" msgstr "" "आउटपुट की क्वालिटी बढ़ाएँ। एक से ज़्यादा बरी इस्तेमाल से क्वालिटी और भी ज़्यादा बढ़ेगी। " -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Python 2.4 या अधिक की ज़रूरत हे।" - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/hr.po b/zenmap/share/zenmap/locale/hr.po index a0194af5d..893139a8f 100644 --- a/zenmap/share/zenmap/locale/hr.po +++ b/zenmap/share/zenmap/locale/hr.po @@ -83,10 +83,6 @@ msgstr "" "Povećaj opširnost ispisa. Može se koristiti više od jednom kako bi dobili " "još veću opširnost" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Python 2.4 ili kasniji je potreban." - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/it.po b/zenmap/share/zenmap/locale/it.po index ddb24f85b..7fc60ea6d 100644 --- a/zenmap/share/zenmap/locale/it.po +++ b/zenmap/share/zenmap/locale/it.po @@ -83,10 +83,6 @@ msgstr "" "Accresci la verbosità dell'output. Può essere utilizzato più di una volta " "per ottenere maggiore verbosità" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "E' richiesto python 2.4 o superiore." - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/ja.po b/zenmap/share/zenmap/locale/ja.po index 60b823617..598556dd3 100644 --- a/zenmap/share/zenmap/locale/ja.po +++ b/zenmap/share/zenmap/locale/ja.po @@ -84,10 +84,6 @@ msgstr "" "スキャン結果の詳細さの数値を増やすことで、より多くの情報を得られるかもしれま" "せん。" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Python 2.4 もしくはそれ以降のバージョンが必要です" - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/pl.po b/zenmap/share/zenmap/locale/pl.po index 32f7d8922..365ee90d5 100644 --- a/zenmap/share/zenmap/locale/pl.po +++ b/zenmap/share/zenmap/locale/pl.po @@ -12,10 +12,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Wymagany jest Python w wersji 2.4 lub nowszej." - #: zenmapCore/UmitDB.py:139 msgid "No module named dbapi2.pysqlite2 or sqlite3" msgstr "Nie znaleziono modułu o nazwie dbapi2.pysqlite2 lub sqlite3" diff --git a/zenmap/share/zenmap/locale/pt_BR.po b/zenmap/share/zenmap/locale/pt_BR.po index 2ccaebbb3..2a38fc667 100644 --- a/zenmap/share/zenmap/locale/pt_BR.po +++ b/zenmap/share/zenmap/locale/pt_BR.po @@ -74,10 +74,6 @@ msgid "" "more verbosity" msgstr "" -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "" - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/ru.po b/zenmap/share/zenmap/locale/ru.po index a8d8becd0..726650125 100644 --- a/zenmap/share/zenmap/locale/ru.po +++ b/zenmap/share/zenmap/locale/ru.po @@ -85,10 +85,6 @@ msgstr "" "Увеличение объема вывода. Может использоваться несколько раз для расширения " "вывода." -#: zenmapCore/NmapCommand.py:139 -msgid "Python 2.4 or later is required." -msgstr "Требуется Python 2.4 или старше" - #: zenmapGUI/ScriptInterface.py:262 msgid "" "There was an error getting the list of scripts from Nmap. Try upgrading Nmap." diff --git a/zenmap/share/zenmap/locale/zh.po b/zenmap/share/zenmap/locale/zh.po index 79020b244..0f8b65f50 100644 --- a/zenmap/share/zenmap/locale/zh.po +++ b/zenmap/share/zenmap/locale/zh.po @@ -14,10 +14,6 @@ msgstr "" "Language-Team: Chinese\n" "Language: zh\n" -#: zenmapCore/NmapCommand.py:109 -msgid "Python 2.4 or later is required." -msgstr "需要安装Python 2.4以上版本。" - #: zenmapCore/UmitOptionParser.py:109 #, python-format msgid "Use DIR as the user configuration directory. Default: %default" diff --git a/zenmap/test/run_tests.py b/zenmap/test/run_tests.py index 214df6dd3..486ffabe1 100644 --- a/zenmap/test/run_tests.py +++ b/zenmap/test/run_tests.py @@ -7,7 +7,7 @@ if __name__ == "__main__": import glob import os if not hasattr(unittest.defaultTestLoader, "discover"): - print("Python unittest discovery missing. Requires Python 2.7 or newer.") # noqa + print("Python unittest discovery missing. Requires Python 3.0 or newer.") # noqa sys.exit(0) os.chdir("..") diff --git a/zenmap/zenmapCore/NmapCommand.py b/zenmap/zenmapCore/NmapCommand.py index 4daa4a0f3..6f016a990 100644 --- a/zenmap/zenmapCore/NmapCommand.py +++ b/zenmap/zenmapCore/NmapCommand.py @@ -70,10 +70,7 @@ import unittest import zenmapCore.I18N # lgtm[py/unused-import] -try: - import subprocess -except ImportError as e: - raise ImportError(str(e) + ".\n" + _("Python 2.4 or later is required.")) +import subprocess import zenmapCore.Paths from zenmapCore.NmapOptions import NmapOptions