From 6ecd0bb196cb1132a1f8c7a94cbc15402db873aa Mon Sep 17 00:00:00 2001 From: Brad Pitcher Date: Sun, 19 Oct 2014 17:09:10 -0700 Subject: [PATCH] avoid TypeError when reading the active io --- Cura/util/bigDataStorage.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Cura/util/bigDataStorage.py b/Cura/util/bigDataStorage.py index 9150455c..970a9ed7 100644 --- a/Cura/util/bigDataStorage.py +++ b/Cura/util/bigDataStorage.py @@ -21,14 +21,17 @@ class BigDataStorage(object): self._active.seek(0) self._read_index = 0 + def activeRead(self, size=None): + return self._active.read(size) if size != None else self._active.read() + def read(self, size=None): - ret = self._active.read(size) + ret = self.activeRead(size) if ret == '': if self._read_index + 1 < len(self._list): self._read_index += 1 self._active = self._list[self._read_index] self._active.seek(0) - ret = self._active.read(size) + ret = self.activeRead(size) return ret def replaceAtStart(self, key, value): @@ -78,4 +81,4 @@ class BigDataStorage(object): for item in self._list: clone._list.append(StringIO.StringIO(item.getvalue())) clone._active = clone._list[-1] - return clone \ No newline at end of file + return clone -- 2.30.2