From f0710bb442a6ddc0f90ff0f67578c9ea661614de Mon Sep 17 00:00:00 2001
From: Sven Gestegard Robertz <sven.robertz@cs.lth.se>
Date: Sat, 15 Feb 2014 18:48:27 +0100
Subject: [PATCH] added LabComm2013 as default version for python encoder and
decoder
---
examples/wiki_example/example_decoder.py | 3 ++-
examples/wiki_example/run | 2 +-
lib/python/labcomm/LabComm.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/examples/wiki_example/example_decoder.py b/examples/wiki_example/example_decoder.py
index 8a0ba7b..a725330 100755
--- a/examples/wiki_example/example_decoder.py
+++ b/examples/wiki_example/example_decoder.py
@@ -4,7 +4,8 @@ import labcomm
import sys
if __name__ == "__main__":
- d = labcomm.Decoder(labcomm.StreamReader(open(sys.argv[1])), sys.argv[2])
+ version = sys.argv[2] if len(sys.argv) == 3 else "LabComm2013"
+ d = labcomm.Decoder(labcomm.StreamReader(open(sys.argv[1])), version)
while True:
try:
diff --git a/examples/wiki_example/run b/examples/wiki_example/run
index 62c288e..c2f3bd5 100755
--- a/examples/wiki_example/run
+++ b/examples/wiki_example/run
@@ -21,4 +21,4 @@ javac -cp ../../lib/java:. *.java
# Run through all executables (c->java->Python)
./example_encoder one two
java -cp ../../lib/java:. example_decoder_encoder example.encoded example.javaencoded
-PYTHONPATH=../../lib/python ./example_decoder.py example.javaencoded LabComm2013
+PYTHONPATH=../../lib/python ./example_decoder.py example.javaencoded
diff --git a/lib/python/labcomm/LabComm.py b/lib/python/labcomm/LabComm.py
index 4be9f8b..5b36d85 100644
--- a/lib/python/labcomm/LabComm.py
+++ b/lib/python/labcomm/LabComm.py
@@ -553,7 +553,7 @@ class Codec(object):
class Encoder(Codec):
- def __init__(self, writer, version):
+ def __init__(self, writer, version="LabComm2013"):
super(Encoder, self).__init__()
self.writer = writer
self.versoin = version
@@ -634,7 +634,7 @@ class Encoder(Codec):
# self.pack("!i%ds" % len(s), len(s), s)
class Decoder(Codec):
- def __init__(self, reader, version):
+ def __init__(self, reader, version="LabComm2013"):
super(Decoder, self).__init__()
self.reader = reader
self.version = version
--
GitLab