[Pymoul-svn] SF.net SVN: pymoul: [214] binaryfile/trunk/src/binaryfile
Status: Alpha
Brought to you by:
tiran
|
From: <ti...@us...> - 2007-02-28 12:01:32
|
Revision: 214
http://pymoul.svn.sourceforge.net/pymoul/?rev=214&view=rev
Author: tiran
Date: 2007-02-28 04:01:33 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
Renamed some methods, classes and changed imports
Modified Paths:
--------------
binaryfile/trunk/src/binaryfile/__init__.py
binaryfile/trunk/src/binaryfile/binary.py
binaryfile/trunk/src/binaryfile/binaryrecord.py
binaryfile/trunk/src/binaryfile/tests.py
Modified: binaryfile/trunk/src/binaryfile/__init__.py
===================================================================
--- binaryfile/trunk/src/binaryfile/__init__.py 2007-02-28 11:59:37 UTC (rev 213)
+++ binaryfile/trunk/src/binaryfile/__init__.py 2007-02-28 12:01:33 UTC (rev 214)
@@ -0,0 +1,4 @@
+# binaryfile package
+from binaryfile.binary import BinaryFile
+from binaryfile.binaryrecord import registerRecord
+from binaryfile.binaryrecord import parseRecord
Modified: binaryfile/trunk/src/binaryfile/binary.py
===================================================================
--- binaryfile/trunk/src/binaryfile/binary.py 2007-02-28 11:59:37 UTC (rev 213)
+++ binaryfile/trunk/src/binaryfile/binary.py 2007-02-28 12:01:33 UTC (rev 214)
@@ -9,9 +9,10 @@
from struct import pack
from struct import unpack
-from binaryrecord import parseRecord
-from binaryrecord import registerRecord
+from binaryfile.binaryrecord import parseRecord
+from binaryfile.binaryrecord import registerRecord
+
class BinaryFile(file):
"""Binary file
Modified: binaryfile/trunk/src/binaryfile/binaryrecord.py
===================================================================
--- binaryfile/trunk/src/binaryfile/binaryrecord.py 2007-02-28 11:59:37 UTC (rev 213)
+++ binaryfile/trunk/src/binaryfile/binaryrecord.py 2007-02-28 12:01:33 UTC (rev 214)
@@ -15,7 +15,7 @@
_marker = object()
-class RecordRegistry(dict):
+class BinaryRecordRegistry(dict):
"""Registry for record definitions
"""
__slots__ = ()
@@ -28,11 +28,11 @@
@type fmt: str
Example:
- >>> reg = RecordRegistry()
+ >>> reg = BinaryRecordRegistry()
>>> registerRecord = reg.register
>>> parseRecord = reg.parse
>>> obj = registerRecord("connection", "4B.ip >H.port >I.session_id")
- >>> isinstance(obj, RecordDefinition)
+ >>> isinstance(obj, BinaryRecordDefinition)
True
>>> data = "\\xc0\\xa8\\x00\\x01" + "\\x00P" + "\\xFE\\xDC\\xBA\\x98"
@@ -48,7 +48,7 @@
"""
if name in self:
raise NameError("%s already registered!" % name)
- self[name] = RecordDefinition(name, fmt)
+ self[name] = BinaryRecordDefinition(name, fmt)
return self[name]
def parse(self, name, fd_data):
@@ -61,7 +61,7 @@
"""
return self[name](fd_data)
-class RecordDefinition(object):
+class BinaryRecordDefinition(object):
"""A record definition
"""
__slots__ = ('_fields', '_recordsize', '_name')
@@ -107,9 +107,9 @@
if len(data) != self._recordsize:
raise ValueError("Data has wrong size: %i, required: %i" %
(len(data), self._recordsize))
- return Record(self._fields, data)
+ return BinaryRecord(self._fields, data)
-class Record(object):
+class BinaryRecord(object):
__slots__ = ('_fields', '_data')
def __init__(self, fields, data=None):
@@ -149,6 +149,6 @@
def __str__(self):
return self.read()
-_recordRegistry = RecordRegistry()
+_recordRegistry = BinaryRecordRegistry()
registerRecord = _recordRegistry.register
parseRecord = _recordRegistry.parse
Modified: binaryfile/trunk/src/binaryfile/tests.py
===================================================================
--- binaryfile/trunk/src/binaryfile/tests.py 2007-02-28 11:59:37 UTC (rev 213)
+++ binaryfile/trunk/src/binaryfile/tests.py 2007-02-28 12:01:33 UTC (rev 214)
@@ -126,8 +126,8 @@
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(BinaryFileTest),
- DocTestSuite('binary'),
- DocTestSuite('binaryrecord'),
+ DocTestSuite('binaryfile.binary'),
+ DocTestSuite('binaryfile.binaryrecord'),
))
if __name__ == '__main__':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|