Merge pull request #10 from allanlei/release-1.1.2

Release 1.1.2

.travis.yml

@@ -5,7 +5,8 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 install:
   - "pip install ."
-script: nosetests
+script: nosetests

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='zipstream',
-    version='1.1.1',
+    version='1.1.2',
     description='Zipfile generator',
     author='Allan Lei',
     author_email='allanlei@helveticode.com',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-envlist = py26, py27, py32, py33, py34, pypy
+envlist = py26, py27, py32, py33, py34, py35, pypy
 
 [testenv]
 deps=nose
-commands = nosetests {posargs}
+commands = nosetests {posargs}

zipstream/__init__.py

@@ -6,7 +6,7 @@
 """
 from __future__ import unicode_literals, print_function, with_statement
 
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
 import os
 import sys
@@ -19,7 +19,8 @@
     str, bytes,
     ZIP64_VERSION,
     ZIP_BZIP2, BZIP2_VERSION,
-    ZIP_LZMA, LZMA_VERSION)
+    ZIP_LZMA, LZMA_VERSION,
+    SEEK_SET, SEEK_CUR, SEEK_END)
 
 from zipfile import (
     ZIP_STORED, ZIP64_LIMIT, ZIP_FILECOUNT_LIMIT, ZIP_MAX_COMMENT,
@@ -70,8 +71,16 @@ def flush(self):
     def next(self):
         raise NotImplementedError()
 
-    def seek(self, offset, whence):
-        raise NotImplementedError()
+    # def seek(self, offset, whence=None):
+    #     if whence == SEEK_SET:
+    #         if offset < 0:
+    #             raise ValueError('negative seek value -1')
+    #         self.data_pointer = offset
+    #     elif whence == SEEK_CUR:
+    #         self.data_pointer = max(0, self.data_pointer + offset)
+    #     elif whence == SEEK_END:
+    #         self.data_pointer = max(0, offset)
+    #     return self.data_pointer
 
     def tell(self):
         return self.data_pointer

zipstream/compat.py

@@ -65,4 +65,10 @@
 try:
     from zipfile import ZIP_MAX_COMMENT
 except ImportError:
-    ZIP_MAX_COMMENT = (1 << 16) - 1
+    ZIP_MAX_COMMENT = (1 << 16) - 1
+
+
+# Copy from io
+SEEK_SET = 0  # start of the stream (the default); offset should be zero or positive
+SEEK_CUR = 1  # current stream position; offset may be negative
+SEEK_END = 2  # end of the stream; offset is usually negative