gpsd-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gpsd-dev] [PATCH 12/12] Removes redundant polystr/polybytes defs from c


From: Fred Wright
Subject: [gpsd-dev] [PATCH 12/12] Removes redundant polystr/polybytes defs from client.py.
Date: Fri, 8 Apr 2016 10:07:53 -0700

TESTED:
Ran "scons check" with both Python 2 and Python 3.
---
 gps/client.py | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/gps/client.py b/gps/client.py
index cdc5059..70f0b34 100644
--- a/gps/client.py
+++ b/gps/client.py
@@ -7,30 +7,9 @@ from __future__ import absolute_import, print_function, 
division
 
 import time, socket, sys, select, json
 
-GPSD_PORT = "2947"
-
-binary_encoding = 'latin-1'
-
-def polystr(o):
-    if isinstance(o, str):
-        return o
-    if isinstance(o, bytes):
-        return str(o, encoding=binary_encoding)
-    raise ValueError
-
-def polybytes(o):
-    if isinstance(o, bytes):
-        return o
-    if isinstance(o, str):
-        return bytes(o, encoding=binary_encoding)
-    raise ValueError
-
-class json_error(BaseException):
-    def __init__(self, data, explanation):
-        BaseException.__init__(self)
-        self.data = data
-        self.explanation = explanation
+from .misc import polystr, polybytes
 
+GPSD_PORT = "2947"
 
 class gpscommon:
     "Isolate socket handling and buffering from the protocol interpretation."
-- 
2.8.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]