Get tox working and fix python3 errors

Author: martinthomson

.gitignore

@@ -1,31 +1,10 @@
-# Logs
-logs
-*.log
 *~
 *.swp
 
-# Runtime data
-pids
-*.pid
-*.seed
 *.pyc
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# Commenting this out is preferred by some people, see
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 node_modules
 
-# Users Environment Variables
-.lock-wscript
+.tox
+.eggs
+.coverage

circle.yml

@@ -9,9 +9,9 @@ dependencies:
     - nodejs/node_modules
   pre:
     - cd nodejs;npm install
-    - pip install pyelliptic cryptography
+    - pip install tox
 
 test:
   override:
     - cd nodejs;node test.js
-    - cd python;python test.py
+    - cd python;tox

python/http_ece/__init__.py

@@ -28,7 +28,8 @@
 
 class ECEException(Exception):
     """Exception for ECE encryption functions"""
-    pass
+    def __init__(self, message):
+        self.message = message
 
 # TODO: turn this into a class so that we don't grow/stomp keys.
 
@@ -78,7 +79,7 @@ def length_prefix(key):
         else:
             raise ECEException(u"unknown 'mode' specified: " + mode)
         if version == "aes128gcm":
-            context = "WebPush: info\x00" + receiver_pub_key + sender_pub_key
+            context = b"WebPush: info\x00" + receiver_pub_key + sender_pub_key
         else:
             label = labels.get(keyid, 'P-256').encode('utf-8')
             context = (label + b"\0" + length_prefix(receiver_pub_key) +
@@ -192,7 +193,7 @@ def parse_content_header(content):
         :type content: str
 
         """
-        id_len = struct.unpack("!B", content[20])[0]
+        id_len = struct.unpack("!B", content[20:21])[0]
         return {
             "salt": content[:16],
             "rs": struct.unpack("!L", content[16:20])[0],
@@ -281,13 +282,14 @@ def encrypt(content, salt=None, key=None, keyid=None, dh=None, rs=4096,
     :rtype str
 
     """
-    def encrypt_record(key, nonce, counter, buffer):
+    def encrypt_record(key, nonce, counter, buf):
         encryptor = Cipher(
             algorithms.AES(key),
             modes.GCM(iv(nonce, counter)),
             backend=default_backend()
         ).encryptor()
-        data = encryptor.update(b"\0\0" + buffer) + encryptor.finalize()
+        data = encryptor.update(b"\0\0" + buf)
+        data += encryptor.finalize()
         data += encryptor.tag
         return data
 

python/http_ece/tests/test_ece.py

@@ -12,7 +12,7 @@
 from http_ece import ECEException
 
 
-TEST_STRING = "You know my name, look up the number."
+TEST_STRING = b"You know my name, look up the number."
 TEST_LEN = len(TEST_STRING)
 LEGACY_FILE = os.path.join(os.sep, "..", "encrypt_data.json")[1:]
 

python/requirements.txt

@@ -1,2 +1 @@
-pyelliptic
-cryptography
+-e .

python/setup.py

@@ -4,27 +4,10 @@
 
 from setuptools import setup
 
-
-def read_from(req_file):
-    reply = []
-    with io.open(os.path.join(here, req_file), encoding='utf8') as data:
-        for l in data:
-            l = l.strip()
-            if not l:
-                break
-            if l[:2] == '-r':
-                reply.extend(read_from(l.split(' ')[1]))
-                continue
-            if l[0] != '#' or l[:2] != '//':
-                reply.append(l)
-    return reply
-
-
 here = os.path.abspath(os.path.dirname(__file__))
 with io.open(os.path.join(here, 'README.rst'), encoding='utf8') as f:
         README = f.read()
 
-
 setup(
     name='http_ece',
     version='0.6.0',
@@ -41,8 +24,16 @@ def read_from(req_file):
         'Programming Language :: Python :: 3.4',
     ],
     keywords='crypto http',
-    install_requires=read_from('requirements.txt'),
-    tests_require=read_from('test-requirements.txt'),
+    install_requires=[
+        'pyelliptic',
+        'cryptography',
+    ],
+    tests_require=[
+        'nose',
+        'mock',
+        'coverage',
+        'flake8',
+    ],
     test_suite="nose.collector",
     url='https://github.com/martinthomson/encrypted-content-encoding',
     license='MIT'

python/test-requirements.txt

@@ -0,0 +1,20 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27,py35
+
+[testenv]
+basepython =
+  py27: python2.7
+  py35: python3.5
+commands =
+  nosetests \
+    []
+deps =
+  nose
+  mock
+  coverage
+  flake8