Merge pull request #324 from ktemkin/fix_py2_so_we_can_kill_it

host: fix python2 compatibility

Author: Qyriad

host/greatfet/commands/greatfet_uart.py

@@ -89,7 +89,7 @@ def main():
 
     # Set up a simple argument parser.
     # TODO: support configurations such as '8n1'
-    parser = GreatFETArgumentParser(description="Simple GreatFET UART monitor.")
+    parser = GreatFETArgumentParser(description="Simple GreatFET UART monitor.", verbose_by_default=True)
     parser.add_argument('baud', nargs='?', type=from_eng_notation, default=115200, help="Baud rate; in symbols/second. Defaults to 115200.")
     parser.add_argument('-d', '--data',  type=int, default=8, help="The number of data bits per frame.")
     parser.add_argument('-S', '--stop',  type=int, default=1, help="The number of stop bits per frame.")

host/greatfet/interface.py

@@ -36,38 +36,36 @@ def run_pirate_commands(self, command_string):
         _CHARS_VALID_IN_NUMBER="0123456789abcdefxh"
 
 
-        result = []
-        commands = list(command_string)
+        self._result = []
+        self._commands = list(command_string)
 
         # Simple performance enhancement: we'll gather any consecutive reads/writes and issue
         # them as single commands to the GreatFET.
-        pending_write_data = []
-        pending_read_length = 0
+        self._pending_write_data = []
+        self._pending_read_length = 0
 
 
         def issue_pending_writes(ends_transaction=False):
             """ Issues any writes pending; used when performing a non-write operation."""
-            nonlocal pending_write_data, result
 
-            if not pending_write_data:
+            if not self._pending_write_data:
                 return
 
             # Perform all of our pending writes.
-            result.extend(self._handle_pirate_write(pending_write_data, ends_transaction=ends_transaction))
-            pending_write_data = []
+            self._result.extend(self._handle_pirate_write(self._pending_write_data, ends_transaction=ends_transaction))
+            self._pending_write_data = []
 
 
         def perform_pending_reads(ends_transaction=False):
             """ Issues any writes pending; used when performing a non-write operation."""
-            nonlocal pending_read_length, result
 
             # If we don't have any pending reads, don't do anything.
-            if not pending_read_length:
+            if not self._pending_read_length:
                 return
 
             # Perform all of our pending reads.
-            result.extend(self._handle_pirate_read(pending_read_length, ends_transaction=ends_transaction))
-            pending_read_length = 0
+            self._result.extend(self._handle_pirate_read(self._pending_read_length, ends_transaction=ends_transaction))
+            self._pending_read_length = 0
 
 
         def handle_pending_io(ends_transaction=False):
@@ -83,16 +81,14 @@ def extract_number(char=None):
             starts with a number.
             """
 
-            nonlocal commands
-
             # Start building our number.
             number = []
 
             try:
 
                 # If we don't have a starting character, read one.
                 if char is None:
-                    char = commands.pop(0)
+                    char = self._commands.pop(0)
 
                 # Grab all characters from the string until we run out of numbers.
                 while char in _CHARS_VALID_IN_NUMBER:
@@ -102,7 +98,7 @@ def extract_number(char=None):
                     char = 'x' if (char == 'h') else char
 
                     number.append(char)
-                    char = commands.pop(0)
+                    char = self._commands.pop(0)
 
 
 
@@ -128,12 +124,11 @@ def get_repeat_count():
             If it doesn't, returns a default value of 1.
 
             """
-            nonlocal commands
 
-            if len(commands) and commands[0] == ':':
+            if len(self._commands) and self._commands[0] == ':':
 
                 # Discard our colon...
-                del commands[0]
+                del self._commands[0]
 
                 # ... and extract the relevant number.
                 return extract_number()
@@ -143,13 +138,13 @@ def get_repeat_count():
 
 
         # Handle each byte in the command string.
-        while commands:
+        while self._commands:
 
             # Start off with no repeat modifier, and no pending operation.
             length = None
 
             # Grab the next command-character in the queue.
-            char = commands.pop(0)
+            char = self._commands.pop(0)
 
             # If this character starts a number, we have a write operation.
             if char in _CHARS_VALID_TO_START_NUMBER:
@@ -160,7 +155,7 @@ def get_repeat_count():
 
                 # Schedule the write.
                 perform_pending_reads()
-                pending_write_data.append(byte)
+                self._pending_write_data.append(byte)
 
             # Handle our core commands.
             elif char in _START_CHARS:
@@ -175,7 +170,7 @@ def get_repeat_count():
                 issue_pending_writes()
 
                 length = get_repeat_count()
-                pending_read_length += length
+                self._pending_read_length += length
 
             elif char in _DELAY_CHARS:
                 handle_pending_io()
@@ -193,7 +188,7 @@ def get_repeat_count():
             # TODO: support 'D/d'?
             # TODO: message on 'Ww'?
 
-        return result
+        return self._result
 
 
     #

host/greatfet/interfaces/gpio.py

@@ -5,7 +5,6 @@
 
 from enum import IntEnum
 from warnings import warn
-from abc import ABC, abstractmethod
 
 from ..interface import GreatFETInterface
 
@@ -28,7 +27,7 @@ class Directions(IntEnum):
 
 
 
-class GPIOProvider(ABC, GreatFETInterface):
+class GPIOProvider(GreatFETInterface):
     """ Base class for an object that provides access to GPIO pins. """
 
     # For convenience.
@@ -212,7 +211,6 @@ def release_pin(self, gpio_pin):
         self.mark_pin_as_unused(gpio_pin.name)
 
 
-    @abstractmethod
     def set_up_pin(self, line, direction, initial_value=False):
         """
         Configure a GPIO line for use as an input or output.  This must be
@@ -225,7 +223,6 @@ def set_up_pin(self, line, direction, initial_value=False):
         pass
 
 
-    @abstractmethod
     def set_pin_state(self, line, state):
         """
         Set the state of an output line.  The line must have previously been
@@ -238,7 +235,6 @@ def set_pin_state(self, line, state):
         pass
 
 
-    @abstractmethod
     def read_pin_state(self, line):
         """
         Get the state of an input line.  The line must have previously been
@@ -253,7 +249,6 @@ def read_pin_state(self, line):
         pass
 
 
-    @abstractmethod
     def get_pin_direction(self, line):
         """
         Gets the direction of a GPIO pin.
@@ -267,7 +262,6 @@ def get_pin_direction(self, line):
         pass
 
 
-    @abstractmethod
     def get_pin_port(self, line):
         """ Returns the 'port number' for a given GPIO pin.
 
@@ -277,7 +271,6 @@ def get_pin_port(self, line):
         pass
 
 
-    @abstractmethod
     def get_pin_identifier(self, line):
         """ Returns the 'pin number' for a given GPIO pin.
 

host/greatfet/util/console.py

@@ -40,6 +40,10 @@ def getkey(self):
 
     def write_bytes(self, byte_string):
         """Write bytes (already encoded)"""
+
+        if isinstance(byte_string, tuple):
+            byte_string = byte_string[0]
+
         self.byte_output.write(byte_string)
         self.byte_output.flush()
 
@@ -140,7 +144,11 @@ def setup(self):
         termios.tcsetattr(self.fd, termios.TCSANOW, new)
 
     def getkey(self):
-        c = sys.stdin.buffer.read(1)
+        try:
+            c = sys.stdin.buffer.read(1)
+        except AttributeError:
+            c = sys.stdin.read(1)
+
         if c == unichr(0x7f):
             c = unichr(8)    # map the BS key (which yields DEL) to backspace
         return c