commit 5b2745c4673319736269ea6b76f3872e7629b5ba
author Rich Lane <rlane@bigswitch.com> Sat Nov 30 00:36:24 2013 -0800
committer Rich Lane <rlane@bigswitch.com> Sat Nov 30 00:38:04 2013 -0800
tree fc4d4ad68f4e3068162e5d160ea7602cbd899a38
parent 3b9b28ef61a64dc3b24ccb1d4431971b6ebfaec4

pyloxi: remove automatic conversion from str to OFReader

User code shouldn't call these methods directly.

py_gen/templates/_ofclass.py

diff --git a/py_gen/templates/_ofclass.py b/py_gen/templates/_ofclass.py
index c84ceea..f902ae8 100644
--- a/py_gen/templates/_ofclass.py
+++ b/py_gen/templates/_ofclass.py
@@ -28,7 +28,7 @@
         return ''.join(packed)
 
     @staticmethod
-    def unpack(buf):
+    def unpack(reader):
         obj = ${ofclass.pyname}()
 :: include("_unpack.py", ofclass=ofclass)
         return obj

py_gen/templates/_unpack.py

diff --git a/py_gen/templates/_unpack.py b/py_gen/templates/_unpack.py
index c3d3fd3..b762a9c 100644
--- a/py_gen/templates/_unpack.py
+++ b/py_gen/templates/_unpack.py
@@ -28,10 +28,6 @@
 :: # TODO coalesce format strings
 :: from loxi_ir import *
 :: from py_gen.oftype import gen_unpack_expr
-        if type(buf) == loxi.generic_util.OFReader:
-            reader = buf
-        else:
-            reader = loxi.generic_util.OFReader(buf)
 :: field_length_members = {}
 :: for m in ofclass.members:
 ::     if type(m) == OFPadMember: