From 6014df706d9cd70ab8b85a82bf2abd9827cce42e Mon Sep 17 00:00:00 2001
From: Martin Bachem <mb@gude.info>
Date: Thu, 12 Dec 2019 14:44:32 +0100
Subject: [PATCH] migrated to python 3

using python 3.7 on Fedora Linux 31
---
 ntpserver.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ntpserver.py b/ntpserver.py
index dc79c6e..eb1024c 100644
--- a/ntpserver.py
+++ b/ntpserver.py
@@ -1,13 +1,14 @@
-import datetime
+#!/usr/bin/python
+
 import socket
 import struct
 import time
-import Queue
-import mutex
+import queue
 import threading
 import select
+import datetime
 
-taskQueue = Queue.Queue()
+taskQueue = queue.Queue()
 stopFlag = False
 
 def system_to_ntp_time(timestamp):
@@ -244,18 +245,18 @@ def run(self):
         global taskQueue,stopFlag
         while True:
             if stopFlag == True:
-                print "RecvThread Ended"
+                print("RecvThread Ended")
                 break
             rlist,wlist,elist = select.select([self.socket],[],[],1);
             if len(rlist) != 0:
-                print "Received %d packets" % len(rlist)
+                print("Received %d packets" % len(rlist))
                 for tempSocket in rlist:
                     try:
                         data,addr = tempSocket.recvfrom(1024)
-                        recvTimestamp = recvTimestamp = system_to_ntp_time(time.time())
+                        recvTimestamp = system_to_ntp_time(time.time())
                         taskQueue.put((data,addr,recvTimestamp))
-                    except socket.error,msg:
-                        print msg;
+                    except:
+                        print()
 
 class WorkThread(threading.Thread):
     def __init__(self,socket):
@@ -265,7 +266,7 @@ def run(self):
         global taskQueue,stopFlag
         while True:
             if stopFlag == True:
-                print "WorkThread Ended"
+                print("WorkThread Ended")
                 break
             try:
                 data,addr,recvTimestamp = taskQueue.get(timeout=1)
@@ -286,8 +287,8 @@ def run(self):
                 sendPacket.recv_timestamp = recvTimestamp
                 sendPacket.tx_timestamp = system_to_ntp_time(time.time())
                 socket.sendto(sendPacket.to_data(),addr)
-                print "Sended to %s:%d" % (addr[0],addr[1])
-            except Queue.Empty:
+                print("Sended to %s:%d" % (addr[0],addr[1]))
+            except queue.Empty:
                 continue
                 
         
@@ -295,7 +296,7 @@ def run(self):
 listenPort = 123
 socket = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
 socket.bind((listenIp,listenPort))
-print "local socket: ", socket.getsockname();
+print("local socket: ", socket.getsockname())
 recvThread = RecvThread(socket)
 recvThread.start()
 workThread = WorkThread(socket)
@@ -305,11 +306,10 @@ def run(self):
     try:
         time.sleep(0.5)
     except KeyboardInterrupt:
-        print "Exiting..."
+        print("Exiting...")
         stopFlag = True
         recvThread.join()
         workThread.join()
         #socket.close()
-        print "Exited"
+        print("Exited")
         break
-