JetDrag
diff --git a/Collapse file
‎eip_tests.py‎
Copy file name to clipboardExpand all lines: eip_tests.py
-25Lines changed: 0 additions & 25 deletions b/Collapse file
‎eip_tests.py‎
Copy file name to clipboardExpand all lines: eip_tests.py
-25Lines changed: 0 additions & 25 deletions
diff --git a/Collapse file
‎javaobj.py‎
Copy file name to clipboardExpand all lines: javaobj.py
+25-4Lines changed: 25 additions & 4 deletions b/Collapse file
‎javaobj.py‎
Copy file name to clipboardExpand all lines: javaobj.py
+25-4Lines changed: 25 additions & 4 deletions
diff --git a/Collapse file
‎peiping.py‎
Copy file name to clipboardExpand all lines: peiping.py
-41Lines changed: 0 additions & 41 deletions b/Collapse file
‎peiping.py‎
Copy file name to clipboardExpand all lines: peiping.py
-41Lines changed: 0 additions & 41 deletions
diff --git a/Collapse file
‎peiping_http.py‎
Copy file name to clipboardExpand all lines: peiping_http.py
-45Lines changed: 0 additions & 45 deletions b/Collapse file
‎peiping_http.py‎
Copy file name to clipboardExpand all lines: peiping_http.py
-45Lines changed: 0 additions & 45 deletions
@@ -1,16 +1,36 @@
+"""Provides functions for reading and writing (writing is WIP currently) Java objects
+serialized or will be deserialized by ObjectOutputStream. This form of object
+representation is a standard data interchange format in Java world.
+
+javaobj module exposes an API familiar to users of the standard library marshal, pickle and json modules.
+
+See: http://download.oracle.com/javase/6/docs/platform/serialization/spec/protocol.html
+"""
+
 import StringIO
 import struct
 
-def loads(object):
+__version__ = "$Revision: 20 $"
+
+def load(file_object):
     """
     Deserializes Java primitive data and objects serialized by ObjectOutputStream
+    from a file-like object.
+    """
+    marshaller = JavaObjectUnmarshaller(file_object)
+    return marshaller.readObject()
+
+
+def loads(string):
+    """
+    Deserializes Java objects and primitive data serialized by ObjectOutputStream
     from a string.
-    See: http://download.oracle.com/javase/6/docs/platform/serialization/spec/protocol.html
     """
-    f = StringIO.StringIO(object)
+    f = StringIO.StringIO(string)
     marshaller = JavaObjectUnmarshaller(f)
     return marshaller.readObject()
 
+
 def dumps(object):
     """
     Serializes Java primitive data and objects unmarshaled by load(s) before into string.
@@ -41,6 +61,7 @@ class JavaObject(object):
     def get_class(self):
         return self.classdesc
 
+
 class JavaObjectConstants:
 
     STREAM_MAGIC = 0xaced
@@ -408,7 +429,7 @@ def _oops_dump_state(self):
             print "Warning!!!!: Stream still has %s bytes left." % len(the_rest)
             print self._create_hexdump(the_rest)
         print "=" * 30
-    # =====================================================================================
+
 
 class JavaObjectMarshaller(JavaObjectConstants):