Merge pull request #28 from dw/version-3.0.0

Version 3.0.0

Author: bbayles

cdblib/cdbdump.py

@@ -6,14 +6,10 @@
 
 def cdbdump(parsed_args, **kwargs):
     # Read binary data from stdin by default
-    stdin = kwargs.get('stdin')
-    if stdin is None:
-        stdin = sys.stdin.buffer
+    stdin = kwargs.get('stdin', sys.stdin.buffer)
 
     # Print text data to stdout by default
-    stdout = kwargs.get('stdout')
-    if stdout is None:
-        stdout = sys.stdout.buffer
+    stdout = kwargs.get('stdout', sys.stdout.buffer)
 
     # Consume stdin and parse the cdb file
     reader_cls = cdblib.Reader64 if parsed_args['64'] else cdblib.Reader

cdblib/cdblib.py

@@ -12,10 +12,10 @@
 
 # Structs for 32-bit databases
 read_2_le4 = Struct('<LL').unpack
-read_2_le8 = Struct('<QQ').unpack
+write_2_le4 = Struct('<LL').pack
 
 # Structs for 64-bit databases
-write_2_le4 = Struct('<LL').pack
+read_2_le8 = Struct('<QQ').unpack
 write_2_le8 = Struct('<QQ').pack
 
 # Encoders for keys
@@ -72,7 +72,7 @@ class Reader(_CDBBase):
     def __init__(self, data, **kwargs):
         '''Create an instance reading from a sequence and using hashfn to hash
         keys.'''
-        if len(data) < 2048:
+        if len(data) < (self.pair_size * 256):
             raise IOError('CDB too small')
 
         self.data = data

cdblib/cdbmake.py

@@ -8,9 +8,7 @@
 class CDBMaker(object):
     def __init__(self, parsed_args, **kwargs):
         # Read binary data from stdin and write errors to stderr (by default)
-        self.stdin = kwargs.get('stdin')
-        if self.stdin is None:
-            self.stdin = sys.stdin.buffer
+        self.stdin = kwargs.get('stdin', sys.stdin.buffer)
 
         self.stderr = kwargs.get('stderr', sys.stderr)
 

docs/versions.rst

@@ -1,6 +1,9 @@
 Version history
 ===============
 
+* `Version 3.0.0 <https://github.com/dw/python-pure-cdb/releases/tag/v2.3.0>`_
+    * This package now supports Python 3 only. For a version that works with Python 2, see `this older release <https://github.com/dw/python-pure-cdb/releases/tag/v2.2.0>`
+    * Added the `python-cdb` compatibility module
 * `Version 2.2.0 <https://github.com/dw/python-pure-cdb/releases/tag/v2.2.0>`_
     * Added non-`strict` mode for convenience when using non-binary keys.
     * API docs are now available at ReadTheDocs.

setup.py

@@ -24,7 +24,7 @@
     keywords='cdb file format appengine database db',
     license='MIT',
     name='pure-cdb',
-    version='4.0.0',
+    version='3.0.0',
     packages=find_packages(include=['cdblib']),
     ext_modules=ext_modules,
     install_requires=[],

tests/cdblib_test.py

@@ -166,6 +166,15 @@ def setUp(self):
         sio.seek(0)
         self.reader = self.reader_cls(sio.getvalue(), hashfn=self.HASHFN)
 
+    def test_min_size(self):
+        with io.BytesIO() as f:
+            with self.writer_cls(f, hashfn=self.HASHFN) as writer:
+                pass
+            data = f.getvalue()
+
+        with self.assertRaises(OSError):
+            reader = self.reader_cls(data[:-1], hashfn=self.HASHFN)
+
     def test_insertion_order(self):
         keys  = [b'dave'] * 10
         keys.append(b'dave_no_dups')