schain-jc Commit - r697:7ac8878019bb

schainpy/model/io/jroIO_usrp_api.py +1 -1

             # from schainpy.serializer import DynamicSerializer
             from schainpy.model.io.jroIO_usrp import USRPReader
-            from schainpy.serializer.DataTranslate import obj2Serial
+            from schainpy.model.serializer.data import obj2Serial
             class USRPReaderAPI(USRPReader, threading.Thread):

schainpy/model/serializer/__init__.py ~~schainpy/serializer/__init__.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/__init__.py to schainpy/model/serializer/__init__.py

schainpy/model/serializer/data.py ~~schainpy/serializer/DataTranslate.py~~ renamed +20 -7

             @author: Miguel Urco
             '''
-            from JROSerializer import DynamicSerializer
+            from serializer import DynamicSerializer
             PICKLE_SERIALIZER = DynamicSerializer('cPickle')
             MSGPACK_SERIALIZER = DynamicSerializer('msgpack')
                 return myObj
-            def obj2Serial(myObj, serializer='msgpack', **kwargs):
+            def dict2Serial(myDict, serializer='msgpack'):
                 if serializer == 'cPickle':
                     SERIALIZER = PICKLE_SERIALIZER
                 else:
                     SERIALIZER = MSGPACK_SERIALIZER
-                myDict = obj2Dict(myObj, **kwargs)
                 mySerial = SERIALIZER.dumps(myDict)
                 return mySerial
                     SERIALIZER = PICKLE_SERIALIZER
                 else:
                     SERIALIZER = MSGPACK_SERIALIZER
+                myDict = SERIALIZER.loads(mySerial)
+                return myDict
+            def obj2Serial(myObj, serializer='msgpack', **kwargs):
+                if serializer == 'cPickle':
+                    SERIALIZER = PICKLE_SERIALIZER
+                else:
+                    SERIALIZER = MSGPACK_SERIALIZER
-                return SERIALIZER.loads(mySerial)
+                myDict = obj2Dict(myObj, **kwargs)
+                mySerial = dict2Serial(myDict, serializer)
+                return mySerial
             def serial2Obj(mySerial, metadataDict = {}, serializer='msgpack'):
                 else:
                     SERIALIZER = MSGPACK_SERIALIZER
-                myDataDict = SERIALIZER.loads(mySerial)
+                myDataDict = serial2Dict(mySerial, serializer)
                 if not metadataDict:
                     myObj = dict2Obj(myDataDict)
                 metadataDict.update(myDataDict)
                 myObj = dict2Obj(metadataDict)
-                return myObj
  No newline at end of file
+                return myObj

schainpy/model/serializer/serializer.py ~~schainpy/serializer/JROSerializer.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/JROSerializer.py to schainpy/model/serializer/serializer.py

schainpy/model/serializer/test/DynamicObject.py ~~schainpy/serializer/test/DynamicObject.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/DynamicObject.py to schainpy/model/serializer/test/DynamicObject.py

schainpy/model/serializer/test/DynamicSerializer.py ~~schainpy/serializer/test/DynamicSerializer.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/DynamicSerializer.py to schainpy/model/serializer/test/DynamicSerializer.py

schainpy/model/serializer/test/DynamicYAML.py ~~schainpy/serializer/test/DynamicYAML.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/DynamicYAML.py to schainpy/model/serializer/test/DynamicYAML.py

schainpy/model/serializer/test/Lookup.py ~~schainpy/serializer/test/Lookup.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/Lookup.py to schainpy/model/serializer/test/Lookup.py

schainpy/model/serializer/test/OrderedYAML.py ~~schainpy/serializer/test/OrderedYAML.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/OrderedYAML.py to schainpy/model/serializer/test/OrderedYAML.py

schainpy/model/serializer/test/PrecisionTime.py ~~schainpy/serializer/test/PrecisionTime.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/PrecisionTime.py to schainpy/model/serializer/test/PrecisionTime.py

schainpy/model/serializer/test/Serializer.py ~~schainpy/serializer/test/Serializer.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/Serializer.py to schainpy/model/serializer/test/Serializer.py

schainpy/model/serializer/test/__init__.py ~~schainpy/serializer/test/__init__.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/__init__.py to schainpy/model/serializer/test/__init__.py

schainpy/model/serializer/test/serialtest.py ~~schainpy/serializer/test/serialtest.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/serialtest.py to schainpy/model/serializer/test/serialtest.py

schainpy/model/serializer/test/test _serializer_speed.py ~~schainpy/serializer/test/test _serializer_speed.py~~ renamed 0 0

NO CONTENT: file renamed from schainpy/serializer/test/test _serializer_speed.py to schainpy/model/serializer/test/test _serializer_speed.py

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages