Revert PR kliment#712 "Add a wrapper around pySerial"

This reverts commit 8c04675, reversing changes made to dfb8077. The wrapper around pyserial is no longer needed since it was intended only for pyserial versions under 2.7.
rockstorm101 · Mar 3, 2018 · 0c66403 · 0c66403
1 parent 46edc1c
commit 0c66403
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 51 deletions.
diff --git a/printrun/printcore.py b/printrun/printcore.py
@@ -20,7 +20,7 @@
     print("You need to run this on Python 3")
     sys.exit(-1)
 
-from .serialWrapper import Serial, SerialException, PARITY_ODD, PARITY_NONE
+from serial import Serial, SerialException, PARITY_ODD, PARITY_NONE
 from select import error as SelectError
 import threading
 from queue import Queue, Empty as QueueEmpty

diff --git a/printrun/serialWrapper.py b/printrun/serialWrapper.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 # python (>= 3.6)
 pyreadline
-pyserial (>= 2.6)
+pyserial >= 2.7
 wxPython (>= 4.0)
 numpy (>= 1.8.2)
 pyglet (>= 1.1)