CallDistanceTransceiver.py: make log_symbol() a standalone function
authorAntonio Ospite <ao2@ao2.it>
Sat, 2 Jan 2016 15:51:37 +0000 (16:51 +0100)
committerAntonio Ospite <ao2@ao2.it>
Mon, 4 Jan 2016 09:48:25 +0000 (10:48 +0100)
There is no need for it to be a method, it does not use "self".

src/savemysugar/CallDistanceTransceiver.py

index aaadafd..d05236b 100755 (executable)
@@ -161,6 +161,11 @@ class MorseDistanceModulator(object):
         return distances
 
 
         return distances
 
 
+def log_symbol(distance, symbol, extra_info=""):
+    logging.info("distance: %.2f Received \"%s\"%s", distance, symbol,
+                 extra_info)
+
+
 class CallDistanceTransceiver(object):
     """Transmit Morse messages using the distance between calls.
 
 class CallDistanceTransceiver(object):
     """Transmit Morse messages using the distance between calls.
 
@@ -285,17 +290,13 @@ class CallDistanceTransceiver(object):
 
         self.end_of_message = False
 
 
         self.end_of_message = False
 
-    def log_symbol(self, distance, symbol, extra_info=""):
-        logging.info("distance: %.2f Received \"%s\"%s", distance, symbol,
-                     extra_info)
-
     def receive_character(self):
         current_ring_time = time.time()
 
         if self.previous_ring_time == -1:
             self.previous_ring_time = current_ring_time
             self.previous_call_time = current_ring_time
     def receive_character(self):
         current_ring_time = time.time()
 
         if self.previous_ring_time == -1:
             self.previous_ring_time = current_ring_time
             self.previous_call_time = current_ring_time
-            self.log_symbol(0, "", "(The very first ring)")
+            log_symbol(0, "", "(The very first ring)")
             return
 
         ring_distance = current_ring_time - self.previous_ring_time
             return
 
         ring_distance = current_ring_time - self.previous_ring_time
@@ -324,7 +325,7 @@ class CallDistanceTransceiver(object):
             character = self.translator.signal_to_character(signal)
             extra_info = " got \"%s\"" % character
 
             character = self.translator.signal_to_character(signal)
             extra_info = " got \"%s\"" % character
 
-        self.log_symbol(call_distance, symbol, extra_info)
+        log_symbol(call_distance, symbol, extra_info)
 
         if symbol != "EOM":
             # Add spaces around the wordspace symbol to make it easier to split
 
         if symbol != "EOM":
             # Add spaces around the wordspace symbol to make it easier to split