portune 0.1.19__py3-none-any.whl → 1.0.0__py3-none-any.whl

portune/portune.py

@@ -32,6 +32,9 @@ from email.mime.application import MIMEApplication
 from typing import List, Dict, Tuple, Any, Optional, Union
 
 # Constants and global variables
+
+# Use system ping command based on the OS
+# as raw socket ICMP ping requires privileges
 OS = platform.system().lower()
 if OS == "windows":
     PING = "ping -n 1 -w {timeoutms} {ip}"
@@ -40,9 +43,9 @@ elif OS == "darwin":  # macOS
 elif OS == "sunos":  # SunOS
     PING = "ping {ip} {timeout}"
 elif OS == "aix":  # IBM AIX
-    PING = "ping -c 1 -w  {timeout} {ip}"
-elif OS.startswith("hp-ux"):  # HP-UX
-    PING = "ping -n 1 -w {timeout} {ip}"
+    PING = "ping -c 1 -w {timeout} {ip}"
+elif OS.startswith("hp-ux"):  # HP-UX 11.11+
+    PING = "ping -n 1 -m {timeout} {ip}"
 else:
     PING = "ping -c 1 -W {timeout} {ip}"
 
@@ -729,6 +732,24 @@ def ping_host(ip: str, timeout: int = 2) -> bool:
     except Exception:
         return False
 
+def is_ip(hostname: str) -> bool:
+    """Check if a given hostname is an IP address.
+
+    Uses inet_aton to determine if the input string is a valid
+    IPv4 address.
+
+    Args:
+        hostname: The hostname or IP address to check
+
+    Returns:
+        True if the hostname is an IP address, False otherwise
+    """
+    try:
+        socket.inet_aton(hostname)
+        return True
+    except socket.error:
+        return False
+
 def resolve_and_ping_host(hostname: str, timeout: int = 2, noping: bool = False) -> Tuple[str, Dict[str, Union[str, bool]]]:
     """Resolve a hostname to IP and optionally check if it responds to ping.
 
@@ -749,25 +770,17 @@ def resolve_and_ping_host(hostname: str, timeout: int = 2, noping: bool = False)
                 - 'hostname': Original resolved hostname (only if different from input)
     """
     try:
-        # Check if hostname is already an IP address
-        try:
-            # Try to create an IP address object to validate format
-            socket.inet_aton(hostname)
-            is_ip = True
-        except socket.error:
-            is_ip = False
-
         # If it's an IP, try to get hostname from reverse DNS
-        if is_ip:
+        if is_ip(hostname):
             try:
-                resolved_hosts = socket.gethostbyaddr(hostname)
+                ip = hostname
+                resolved_hosts = socket.gethostbyaddr(ip)
                 if resolved_hosts and resolved_hosts[0]:
                     hostname = resolved_hosts[0]  # Use the resolved hostname
             except (socket.herror, socket.gaierror):
                 pass  # Keep the IP as hostname if reverse lookup fails
-
-        # Now resolve the hostname (or IP) to get its IP
-        ip = socket.gethostbyname(hostname)
+        else:
+            ip = socket.gethostbyname(hostname)
         if noping:
             return hostname, {'ip': ip, 'ping': False}
         ping_status = ping_host(ip, timeout)
@@ -1101,12 +1114,10 @@ def compute_stats(
     })
     
     for hostname, ip, port, status, _, _ in results:
-        # For IP addresses, use VLAN/16 as domain
-        try:
-            socket.inet_aton(hostname)
-            # It's a valid IP address, use VLAN/16
+        if is_ip(hostname):
+            # For IP addresses, use VLAN/16 as domain
             domain = '.'.join(hostname.split('.')[:2]) + '.0.0'
-        except socket.error:
+        else:
             # Not an IP address, extract domain normally
             parts = hostname.split('.')
             if len(parts) > 1:
@@ -1410,6 +1421,7 @@ def print_statistics(stats, timeout, parallelism):
             first_row = False
         if not first_row:  # Only print separator between domains if domain had data
             print(separator, file=sys.stderr)
+
 def format_table_output(
     results: List[Tuple[str, str, int, str, bool]], 
     noping: bool

portune/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.19'
-__version_tuple__ = version_tuple = (0, 1, 19)
+__version__ = version = '1.0.0'
+__version_tuple__ = version_tuple = (1, 0, 0)

{portune-0.1.19.dist-info → portune-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.19
+Version: 1.0.0
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau
@@ -36,7 +36,7 @@ Dynamic: license-file
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
 [![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
 [![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
-[![bash](https://img.shields.io/badge/OS-Windows%20|Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
+[![bash](https://img.shields.io/badge/OS-%20Windows%20|%20Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
 
 # portune
 

portune-1.0.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+portune/__init__.py,sha256=RfXuNfHBqfRt_z4IukwN1a0oeCXahuMOO8_eBt4T8NM,58
+portune/portune.py,sha256=o4d9DX9mGbz7SEiUQMHLVGio_PAOTaoZ4WkCxHd4eOk,67871
+portune/version.py,sha256=fo5PXsZuloQZu3LdpIFTUAXvJmY2L9N5sNGe2tvdU98,511
+portune-1.0.0.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+portune-1.0.0.dist-info/METADATA,sha256=aexgNHkPJhCErrbLOIOoIipJfhP0F2pf2BKGcBgKe-s,2377
+portune-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+portune-1.0.0.dist-info/entry_points.txt,sha256=6j7jAf5fOZrLPbVIs3z92R1tT891WyY9YxQ6OVnPKG0,80
+portune-1.0.0.dist-info/top_level.txt,sha256=CITDikHhRKAsSOGmNJzD-xSp6D5iBhSr9ZS1qy8-SL0,8
+portune-1.0.0.dist-info/RECORD,,

portune-0.1.19.dist-info/RECORD

@@ -1,9 +0,0 @@
-portune/__init__.py,sha256=RfXuNfHBqfRt_z4IukwN1a0oeCXahuMOO8_eBt4T8NM,58
-portune/portune.py,sha256=2gx3Xvt9sPjK_JQZgelzhbt8ax6WQfXxsOuj1OtTZRc,67693
-portune/version.py,sha256=-W-i-_6L24OJ73VmeltYID1xpUrwRUNYxZXkfU86ff0,513
-portune-0.1.19.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-portune-0.1.19.dist-info/METADATA,sha256=My1iWiWBrwLO2w7mM0Udei24zKwAaDuC_tNOoUje_B4,2372
-portune-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-portune-0.1.19.dist-info/entry_points.txt,sha256=6j7jAf5fOZrLPbVIs3z92R1tT891WyY9YxQ6OVnPKG0,80
-portune-0.1.19.dist-info/top_level.txt,sha256=CITDikHhRKAsSOGmNJzD-xSp6D5iBhSr9ZS1qy8-SL0,8
-portune-0.1.19.dist-info/RECORD,,