| @@ -16,7 +16,7 SERIALIZER = cPickle | |||
|
|
16 | 16 | |
|
|
17 | 17 | # from schainpy.serializer import DynamicSerializer |
|
|
18 | 18 | from schainpy.model.io.jroIO_usrp import USRPReader |
|
|
19 |
from schainpy.serializer. |
|
|
|
19 | from schainpy.model.serializer.data import obj2Serial | |
|
|
20 | 20 | |
|
|
21 | 21 | class USRPReaderAPI(USRPReader, threading.Thread): |
|
|
22 | 22 | |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/__init__.py to schainpy/model/serializer/__init__.py |
| @@ -3,7 +3,7 Created on Jul 15, 2014 | |||
|
|
3 | 3 | |
|
|
4 | 4 | @author: Miguel Urco |
|
|
5 | 5 | ''' |
|
|
6 |
from |
|
|
|
6 | from serializer import DynamicSerializer | |
|
|
7 | 7 | |
|
|
8 | 8 | PICKLE_SERIALIZER = DynamicSerializer('cPickle') |
|
|
9 | 9 | MSGPACK_SERIALIZER = DynamicSerializer('msgpack') |
| @@ -75,14 +75,13 def dict2Obj(myDict): | |||
|
|
75 | 75 | |
|
|
76 | 76 | return myObj |
|
|
77 | 77 | |
|
|
78 |
def |
|
|
|
78 | def dict2Serial(myDict, serializer='msgpack'): | |
|
|
79 | 79 | |
|
|
80 | 80 | if serializer == 'cPickle': |
|
|
81 | 81 | SERIALIZER = PICKLE_SERIALIZER |
|
|
82 | 82 | else: |
|
|
83 | 83 | SERIALIZER = MSGPACK_SERIALIZER |
|
|
84 | 84 |
|
|
|
85 | myDict = obj2Dict(myObj, **kwargs) | |
|
|
86 | 85 | mySerial = SERIALIZER.dumps(myDict) |
|
|
87 | 86 | |
|
|
88 | 87 | return mySerial |
| @@ -94,7 +93,21 def serial2Dict(mySerial, serializer='msgpack'): | |||
|
|
94 | 93 | else: |
|
|
95 | 94 | SERIALIZER = MSGPACK_SERIALIZER |
|
|
96 | 95 |
|
|
|
97 |
|
|
|
|
96 | myDict = SERIALIZER.loads(mySerial) | |
|
|
97 | ||
|
|
98 | return myDict | |
|
|
99 | ||
|
|
100 | def obj2Serial(myObj, serializer='msgpack', **kwargs): | |
|
|
101 | ||
|
|
102 | if serializer == 'cPickle': | |
|
|
103 | SERIALIZER = PICKLE_SERIALIZER | |
|
|
104 | else: | |
|
|
105 | SERIALIZER = MSGPACK_SERIALIZER | |
|
|
106 | ||
|
|
107 | myDict = obj2Dict(myObj, **kwargs) | |
|
|
108 | mySerial = dict2Serial(myDict, serializer) | |
|
|
109 | ||
|
|
110 | return mySerial | |
|
|
98 | 111 | |
|
|
99 | 112 | def serial2Obj(mySerial, metadataDict = {}, serializer='msgpack'): |
|
|
100 | 113 | |
| @@ -103,7 +116,7 def serial2Obj(mySerial, metadataDict = {}, serializer='msgpack'): | |||
|
|
103 | 116 | else: |
|
|
104 | 117 | SERIALIZER = MSGPACK_SERIALIZER |
|
|
105 | 118 | |
|
|
106 |
myDataDict = |
|
|
|
119 | myDataDict = serial2Dict(mySerial, serializer) | |
|
|
107 | 120 | |
|
|
108 | 121 | if not metadataDict: |
|
|
109 | 122 | myObj = dict2Obj(myDataDict) |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/JROSerializer.py to schainpy/model/serializer/serializer.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/DynamicObject.py to schainpy/model/serializer/test/DynamicObject.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/DynamicSerializer.py to schainpy/model/serializer/test/DynamicSerializer.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/DynamicYAML.py to schainpy/model/serializer/test/DynamicYAML.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/Lookup.py to schainpy/model/serializer/test/Lookup.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/OrderedYAML.py to schainpy/model/serializer/test/OrderedYAML.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/PrecisionTime.py to schainpy/model/serializer/test/PrecisionTime.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/Serializer.py to schainpy/model/serializer/test/Serializer.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/__init__.py to schainpy/model/serializer/test/__init__.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/serialtest.py to schainpy/model/serializer/test/serialtest.py |
|
|
1 | NO CONTENT: file renamed from schainpy/serializer/test/test _serializer_speed.py to schainpy/model/serializer/test/test _serializer_speed.py |
General Comments 0
You need to be logged in to leave comments.
Login now