86 six.

swift-nav · Jun 19, 2015 · f7acbae · f7acbae
1 parent 94a889d
commit f7acbae
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 19 deletions.
diff --git a/generator/sbpg/targets/python.py b/generator/sbpg/targets/python.py
@@ -64,7 +64,7 @@ def construct_format(f, type_map=CONSTRUCT_CODE):
   elif f.type_id == 'string' and f.options.get('size', None):
     return "String('%s', %d)" % (f.identifier, f.options['size'].value)
   elif f.type_id == 'string':
-    return "CString('%s', six.b('\\n'))" % (f.identifier)
+    return "CString('%s')" % (f.identifier)
   elif f.type_id == 'array' and f.options.get('size', None):
     fill = f.options['fill'].value
     f_ = copy.copy(f)

diff --git a/generator/sbpg/targets/resources/sbp_construct_template.py.j2 b/generator/sbpg/targets/resources/sbp_construct_template.py.j2
@@ -18,7 +18,6 @@ from construct import *
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 ((*- for i in include *))
 from (((module_path))).(((i))) import *

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,4 +1,3 @@
-six
 boto==2.38.0
 construct==2.5.2
 cov-core==1.15.0

diff --git a/python/sbp/acquisition.py b/python/sbp/acquisition.py
@@ -18,7 +18,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/acquisition.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/bootload.py b/python/sbp/bootload.py
@@ -24,7 +24,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/bootload.yaml with generate.py.
 # Please do not hand edit!
@@ -89,7 +88,7 @@ class MsgBootloaderHandshakeResponse(SBP):
   """
   _parser = Struct("MsgBootloaderHandshakeResponse",
                    ULInt32('flags'),
-                   CString('version', six.b('\n')),)
+                   CString('version'),)
 
   def __init__(self, sbp=None, **kwargs):
     if sbp:

diff --git a/python/sbp/deprecated.py b/python/sbp/deprecated.py
@@ -18,7 +18,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/deprecated.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/ext_events.py b/python/sbp/ext_events.py
@@ -20,7 +20,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/ext_events.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/file_io.py b/python/sbp/file_io.py
@@ -28,7 +28,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/file_io.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/flash.py b/python/sbp/flash.py
@@ -25,7 +25,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/flash.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/logging.py b/python/sbp/logging.py
@@ -20,7 +20,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/logging.yaml with generate.py.
 # Please do not hand edit!
@@ -51,7 +50,7 @@ class MsgPrint(SBP):
 
   """
   _parser = Struct("MsgPrint",
-                   CString('text', six.b('\n')),)
+                   CString('text'),)
 
   def __init__(self, sbp=None, **kwargs):
     if sbp:

diff --git a/python/sbp/navigation.py b/python/sbp/navigation.py
@@ -29,7 +29,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/navigation.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/observation.py b/python/sbp/observation.py
@@ -18,7 +18,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/observation.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/piksi.py b/python/sbp/piksi.py
@@ -24,7 +24,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/piksi.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/settings.py b/python/sbp/settings.py
@@ -25,7 +25,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/settings.yaml with generate.py.
 # Please do not hand edit!
@@ -57,7 +56,7 @@ class MsgSettings(SBP):
 
   """
   _parser = Struct("MsgSettings",
-                   CString('setting', six.b('\n')),)
+                   CString('setting'),)
 
   def __init__(self, sbp=None, **kwargs):
     if sbp:

diff --git a/python/sbp/system.py b/python/sbp/system.py
@@ -18,7 +18,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/system.yaml with generate.py.
 # Please do not hand edit!

diff --git a/python/sbp/tracking.py b/python/sbp/tracking.py
@@ -19,7 +19,6 @@
 import json
 from sbp.msg import SBP
 from sbp.utils import fmt_repr, exclude_fields, walk_json_dict, containerize
-import six
 
 # Automatically generated from piksi/yaml/swiftnav/sbp/tracking.yaml with generate.py.
 # Please do not hand edit!