diff --git a/.gitignore b/.gitignore index de10f0051a72d7547495f6a760f458d2806a5232..918b457cbfce0212413e0f412e37eb371e6a638f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.idea .eggs .cache build diff --git a/edosl0util/split.py b/edosl0util/split.py index aff0442b52b79cc60d48d6b3365bf5ddf971a353..f047c22e47316f104382090180b3f8b0af6cc8bf 100644 --- a/edosl0util/split.py +++ b/edosl0util/split.py @@ -36,7 +36,7 @@ def split_stream(stream, minutes): cur_bucket = pkt_bucket # this is an append operation - buf += pkt.bytes() + buf.extend(pkt.bytes()) pkt_count += 1 yield cur_bucket, pkt_count, buf diff --git a/edosl0util/stream.py b/edosl0util/stream.py index f92924cf9830cf3014aadffe0a5693864c7a6bd7..0342487abbd55a4f0b64937741b06d86958def63 100644 --- a/edosl0util/stream.py +++ b/edosl0util/stream.py @@ -99,7 +99,7 @@ class BasicStream(object): data = self._read(data_size) else: data = None - self.fobj.seek(data_size, os.SEEK_CUR) + self.file.seek(data_size, os.SEEK_CUR) return self.Tracker(h1, h2, total_size, offset, data)