chiark / gitweb /
avoid TypeError when reading the active io
authorBrad Pitcher <bradpitcher@gmail.com>
Mon, 20 Oct 2014 00:09:10 +0000 (17:09 -0700)
committerBrad Pitcher <bradpitcher@gmail.com>
Mon, 20 Oct 2014 00:09:10 +0000 (17:09 -0700)
Cura/util/bigDataStorage.py

index 9150455cad8c6b19d9445cfc39a6b13f434c5f6b..970a9ed7ee31f115c202c936f4b67a5aaa214da4 100644 (file)
@@ -21,14 +21,17 @@ class BigDataStorage(object):
                self._active.seek(0)\r
                self._read_index = 0\r
 \r
+       def activeRead(self, size=None):\r
+               return self._active.read(size) if size != None else self._active.read()\r
+\r
        def read(self, size=None):\r
-               ret = self._active.read(size)\r
+               ret = self.activeRead(size)\r
                if ret == '':\r
                        if self._read_index + 1 < len(self._list):\r
                                self._read_index += 1\r
                                self._active = self._list[self._read_index]\r
                                self._active.seek(0)\r
-                               ret = self._active.read(size)\r
+                               ret = self.activeRead(size)\r
                return ret\r
 \r
        def replaceAtStart(self, key, value):\r
@@ -78,4 +81,4 @@ class BigDataStorage(object):
                for item in self._list:\r
                        clone._list.append(StringIO.StringIO(item.getvalue()))\r
                clone._active = clone._list[-1]\r
-               return clone
\ No newline at end of file
+               return clone\r