Skip to content

Fix some minor possible issues #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some minor possible issues #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@
def get_ident(): return 0

if sys.platform == "win32":
# On Windows, the best timer is time.clock()
default_timer = time.clock
# On Windows, the best timer is time.clock() until python 3.3 which deprecates time.clock()
if sys.version_info[1] < 3:
default_timer = time.clock
else:
default_timer = time.perf_counter
else:
# On most other platforms the best timer is time.time()
default_timer = time.time
Expand Down Expand Up @@ -138,6 +141,8 @@ def fracLoss(self):
if self._frac_loss is None:
if self.pktsSent > 0:
self._frac_loss = self.pktsLost / self.pktsSent
else:
self._frac_loss = 1.0
return self._frac_loss

def packet_sent(self, n=1):
Expand Down Expand Up @@ -494,7 +499,7 @@ def verbose_ping(hostname, timeout=3000, count=3,
while 1:
delay = single_ping(destIP, hostname, timeout, mySeqNumber,
numDataBytes, ipv6=ipv6, myStats=myStats, sourceIP=sourceIP)
delay = 0 if delay is None else delay[0]
delay = 0 if delay is None or delay[0] is None else delay[0]

mySeqNumber += 1

Expand Down