Skip to content

Commit

Permalink
Remove dependency of zipfile in stdlib. This fixes #1
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Koch committed Nov 8, 2018
1 parent 44bb4a0 commit 897f03d
Show file tree
Hide file tree
Showing 6 changed files with 877 additions and 207 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ jobs:
script: python -m unittest discover tests/python3/
- python: "3.6"
script: python -m unittest discover tests/python3/
- python: "3.7"
dist: xenial
sudo: true
script: python -m unittest discover tests/python3/
- stage: deploy
script: skip
deploy:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='zipencrypt',
version='0.3.0',
version='0.3.1',
description='Encryption for zipfile',
long_description=readme,
url='https://github.com/devthat/zipencrypt',
Expand All @@ -19,6 +19,7 @@
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Topic :: System :: Archiving :: Compression',
Expand Down
4 changes: 2 additions & 2 deletions tests/python3/test_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import unittest
from test.support import TESTFN

from zipencrypt import ZipFile
from zipencrypt.zipencrypt3 import _ZipEncrypter, _ZipDecrypter, ZipInfo, ZIP_DEFLATED
from zipencrypt import ZipFile, ZipInfo, ZIP_DEFLATED
from zipencrypt.zipencrypt3 import _ZipEncrypter, _ZipDecrypter


class TestEncryption(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py34,py35,py36
envlist = py27,py34,py35,py36,py37

[testenv:py27]
deps=mock
Expand Down
10 changes: 3 additions & 7 deletions zipencrypt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
__all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED",
"is_zipfile", "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"]
else:
from .zipencrypt3 import ZipFile, is_zipfile, ZipInfo
from zipfile import BadZipFile, BadZipfile, error, ZIP_STORED, \
ZIP_DEFLATED, ZIP_BZIP2, ZIP_LZMA, PyZipFile, \
LargeZipFile
__all__ = ["BadZipFile", "BadZipfile", "error",
"ZIP_STORED", "ZIP_DEFLATED", "ZIP_BZIP2", "ZIP_LZMA",
"is_zipfile", "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"]
from .zipencrypt3 import __all__ as zipencrypt3_all
from .zipencrypt3 import *
__all__ = zipencrypt3_all
Loading

0 comments on commit 897f03d

Please sign in to comment.