Use semantic versioning

and more standard constant names
This commit is contained in:
Babak Farrokhi 2017-04-24 17:43:47 +04:30
parent 21944596fb
commit bde3263cfa
Signed by: farrokhi
GPG Key ID: 6B267AD85D632E9A
3 changed files with 18 additions and 14 deletions

View File

@ -38,15 +38,17 @@ from statistics import stdev
import dns.rdatatype
import dns.resolver
__VERSION__ = 1.6
__PROGNAME__ = os.path.basename(sys.argv[0])
__author__ = 'Babak Farrokhi (babak@farrokhi.net)'
__license__ = 'BSD'
__version__ = "1.6.0"
__progname__ = os.path.basename(sys.argv[0])
shutdown = False
resolvers = dns.resolver.get_default_resolver().nameservers
def usage():
print("""%s version %1.1f
print("""%s version %s
usage: %s [-h] [-f server-list] [-c count] [-t type] [-w wait] hostname
-h --help show this help
@ -57,7 +59,7 @@ usage: %s [-h] [-f server-list] [-c count] [-t type] [-w wait] hostname
-T --tcp Use TCP instead of UDP
-e --edns Disable EDNS0 (Default: Enabled)
-v --verbose Print actual dns response
""" % (__PROGNAME__, __VERSION__, __PROGNAME__))
""" % (__progname__, __version__, __progname__))
sys.exit()

View File

@ -38,13 +38,15 @@ import dns.flags
import dns.rdatatype
import dns.resolver
__VERSION__ = 1.6
__PROGNAME__ = os.path.basename(sys.argv[0])
__author__ = 'Babak Farrokhi (babak@farrokhi.net)'
__license__ = 'BSD'
__version__ = "1.6.0"
__progname__ = os.path.basename(sys.argv[0])
shutdown = False
def usage():
print("""%s version %1.1f
print("""%s version %s
usage: %s [-ehqv] [-s server] [-p port] [-P port] [-S address] [-c count] [-t type] [-w wait] hostname
-h --help Show this help
-q --quiet Quiet
@ -61,7 +63,7 @@ usage: %s [-ehqv] [-s server] [-p port] [-P port] [-S address] [-c count] [-t ty
-i --interval Time between each request (default: 0 seconds)
-t --type DNS request record type (default: A)
-e --edns Disable EDNS0 (default: Enabled)
""" % (__PROGNAME__, __VERSION__, __PROGNAME__))
""" % (__progname__, __version__, __progname__))
sys.exit(0)
@ -172,7 +174,7 @@ def main():
response_time = []
i = 0
print("%s DNS: %s:%d, hostname: %s, rdatatype: %s" % (__PROGNAME__, dnsserver, dst_port, hostname, dnsrecord))
print("%s DNS: %s:%d, hostname: %s, rdatatype: %s" % (__progname__, dnsserver, dst_port, hostname, dnsrecord))
for i in range(count):
if shutdown:

View File

@ -43,7 +43,7 @@ from cymruwhois import cymruwhois
__author__ = 'Babak Farrokhi (babak@farrokhi.net)'
__license__ = 'BSD'
__version__ = 1.6
__version__ = "1.6.0"
_ttl = None
quiet = False
@ -65,7 +65,7 @@ def test_import():
# Constants
__PROGNAME__ = os.path.basename(sys.argv[0])
__progname__ = os.path.basename(sys.argv[0])
WHOIS_CACHE = 'whois.cache'
@ -117,8 +117,8 @@ except IOError:
def usage():
print('%s version %1.1f\n' % (__PROGNAME__, __version__))
print('usage: %s [-aeqhCx] [-s server] [-p port] [-c count] [-t type] [-w wait] hostname' % __PROGNAME__)
print('%s version %s\n' % (__progname__, __version__))
print('usage: %s [-aeqhCx] [-s server] [-p port] [-c count] [-t type] [-w wait] hostname' % __progname__)
print(' -h --help Show this help')
print(' -q --quiet Quiet')
print(' -x --expert Print expert hints if available')
@ -303,7 +303,7 @@ def main():
trace_path = []
if not quiet:
print("%s DNS: %s:%d, hostname: %s, rdatatype: %s" % (__PROGNAME__, dnsserver, dest_port, hostname, dnsrecord),
print("%s DNS: %s:%d, hostname: %s, rdatatype: %s" % (__progname__, dnsserver, dest_port, hostname, dnsrecord),
flush=True)
while True: