From 837b57fdd1a814237ef4b15f6ce19c701303aebb Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Tue, 17 Aug 2021 01:44:04 +0200
Subject: [PATCH] Rename nmap to python-nmap (#5931)

---
 stubs/nmap/@tests/stubtest_allowlist.txt      | 12 ------------
 stubs/{nmap => python-nmap}/METADATA.toml     |  2 +-
 stubs/{nmap => python-nmap}/nmap/__init__.pyi |  0
 stubs/{nmap => python-nmap}/nmap/nmap.pyi     | 11 ++++++++---
 4 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 stubs/nmap/@tests/stubtest_allowlist.txt
 rename stubs/{nmap => python-nmap}/METADATA.toml (64%)
 rename stubs/{nmap => python-nmap}/nmap/__init__.pyi (100%)
 rename stubs/{nmap => python-nmap}/nmap/nmap.pyi (91%)

diff --git a/stubs/nmap/@tests/stubtest_allowlist.txt b/stubs/nmap/@tests/stubtest_allowlist.txt
deleted file mode 100644
index f55d24035..000000000
--- a/stubs/nmap/@tests/stubtest_allowlist.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-nmap.PortScanner
-nmap.PortScannerAsync
-nmap.PortScannerError
-nmap.PortScannerHostDict
-nmap.PortScannerYield
-nmap.convert_nmap_output_to_encoding
-nmap.nmap.PortScanner
-nmap.nmap.PortScannerAsync
-nmap.nmap.PortScannerError
-nmap.nmap.PortScannerHostDict
-nmap.nmap.PortScannerYield
-nmap.nmap.convert_nmap_output_to_encoding
diff --git a/stubs/nmap/METADATA.toml b/stubs/python-nmap/METADATA.toml
similarity index 64%
rename from stubs/nmap/METADATA.toml
rename to stubs/python-nmap/METADATA.toml
index e43ccaae3..9d5d312e6 100644
--- a/stubs/nmap/METADATA.toml
+++ b/stubs/python-nmap/METADATA.toml
@@ -1,3 +1,3 @@
-version = "0.1"
+version = "0.6"
 python2 = true
 requires = []
diff --git a/stubs/nmap/nmap/__init__.pyi b/stubs/python-nmap/nmap/__init__.pyi
similarity index 100%
rename from stubs/nmap/nmap/__init__.pyi
rename to stubs/python-nmap/nmap/__init__.pyi
diff --git a/stubs/nmap/nmap/nmap.pyi b/stubs/python-nmap/nmap/nmap.pyi
similarity index 91%
rename from stubs/nmap/nmap/nmap.pyi
rename to stubs/python-nmap/nmap/nmap.pyi
index 60b8632ac..c28623dd8 100644
--- a/stubs/nmap/nmap/nmap.pyi
+++ b/stubs/python-nmap/nmap/nmap.pyi
@@ -54,7 +54,9 @@ class PortScanner(object):
     def get_nmap_last_output(self) -> Text: ...
     def nmap_version(self) -> Tuple[int, int]: ...
     def listscan(self, hosts: str = ...) -> list[str]: ...
-    def scan(self, hosts: Text = ..., ports: Text | None = ..., arguments: Text = ..., sudo: bool = ...) -> _Result: ...
+    def scan(
+        self, hosts: Text = ..., ports: Text | None = ..., arguments: Text = ..., sudo: bool = ..., timeout: int = ...
+    ) -> _Result: ...
     def analyse_nmap_xml_scan(
         self,
         nmap_xml_output: str | None = ...,
@@ -71,7 +73,7 @@ class PortScanner(object):
     def csv(self) -> str: ...
 
 def __scan_progressive__(
-    self: object, hosts: Text, ports: Text, arguments: Text, callback: _Callback | None, sudo: bool
+    self: object, hosts: Text, ports: Text, arguments: Text, callback: _Callback | None, sudo: bool, timeout: int
 ) -> None: ...
 
 class PortScannerAsync(object):
@@ -84,6 +86,7 @@ class PortScannerAsync(object):
         arguments: Text = ...,
         callback: _Callback | None = ...,
         sudo: bool = ...,
+        timeout: int = ...,
     ) -> None: ...
     def stop(self) -> None: ...
     def wait(self, timeout: int | None = ...) -> None: ...
@@ -92,7 +95,7 @@ class PortScannerAsync(object):
 class PortScannerYield(PortScannerAsync):
     def __init__(self) -> None: ...
     def scan(  # type: ignore
-        self, hosts: str = ..., ports: str | None = ..., arguments: str = ..., sudo: bool = ...
+        self, hosts: str = ..., ports: str | None = ..., arguments: str = ..., sudo: bool = ..., timeout: int = ...
     ) -> Iterator[Tuple[str, _Result]]: ...
     def stop(self) -> None: ...
     def wait(self, timeout: int | None = ...) -> None: ...
@@ -121,4 +124,6 @@ class PortScannerError(Exception):
     value: str
     def __init__(self, value: str) -> None: ...
 
+class PortScannerTimeout(PortScannerError): ...
+
 def convert_nmap_output_to_encoding(value: _T, code: str = ...) -> _T: ...