Merge branch 'develop'

Author: whtsky

MANIFEST.in

@@ -1,2 +1,3 @@
-include bencoder.c bencoder.pyx README.rst pytest.ini LICENSE
-recursive-include tests *
+include bencoder.pyx README.rst LICENSE
+global-exclude *.pyc __pycache__
+recursive-include tests *.py *.torrent

README.rst

@@ -3,17 +3,16 @@ Bencoder.pyx
 
 A fast bencode implementation in Cython supports both Python2 & Python3 .
 
-.. image:: https://img.shields.io/travis/whtsky/bencoder.pyx/master.svg?maxAge=3600&label=macOS
+.. image:: https://img.shields.io/travis/whtsky/bencoder.pyx/develop.svg?maxAge=3600&label=macOS
     :target: https://travis-ci.org/whtsky/bencoder.pyx
-.. image:: https://img.shields.io/appveyor/ci/whtsky/bencoder-pyx/master.svg?maxAge=3600&label=Windows
+.. image:: https://img.shields.io/appveyor/ci/whtsky/bencoder-pyx/develop.svg?maxAge=3600&label=Windows
     :target: https://ci.appveyor.com/project/whtsky/bencoder-pyx
-.. image:: https://semaphoreci.com/api/v1/whtsky/bencoder-pyx/branches/master/shields_badge.svg
+.. image:: https://semaphoreci.com/api/v1/whtsky/bencoder-pyx/branches/develop/shields_badge.svg
     :target: https://semaphoreci.com/whtsky/bencoder-pyx
 
-
-.. image:: https://img.shields.io/travis/whtsky/bencoder.pyx/master.svg?maxAge=3600&label=wheels
+.. image:: https://img.shields.io/travis/whtsky/bencoder.pyx/develop.svg?maxAge=3600&label=wheels
     :target: https://travis-ci.org/whtsky/bencoder.pyx
-.. image:: https://codecov.io/gh/whtsky/bencoder.pyx/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/whtsky/bencoder.pyx/branch/develop/graph/badge.svg
     :target: https://codecov.io/gh/whtsky/bencoder.pyx
 
 Install
@@ -43,6 +42,12 @@ Usage
 ChangeLog
 ----------
 
+Version 1.1.3
+~~~~~~~~~~~~~~~
+
++ Performance Improvement
++ Fix package metainfo ` #3 <https://github.com/whtsky/bencoder.pyx/issues/3>`_
+
 Version 1.1.2
 ~~~~~~~~~~~~~~~
 

appveyor.yml

@@ -4,25 +4,39 @@ cache:
 environment:
   PYPI_PASSWD:
     secure: pp1j5lAB9NN8ZDasgY+oxoGrNw0+4gGzbNZmHVwJkCzUyrNBP5ZIuCrwjmx4q6ifg7RMiE3bVt9MljFCJh3XpsvVOAcx+AGKsHSjtXd40HM=
+
+  matrix:
+    - PYTHON: "C:\\Python26"
+    - PYTHON: "C:\\Python26-x64"
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python33-x64"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python34-x64"
+    - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python35-x64"
+
 init:
   - ps: "ls C:/Python*"
 
 install:
-  - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
-  - SET PATH=C:\Python35;C:\Python35\scripts;C:\tools\pypy\pypy;%PATH%
+  - SET PATH=%PYTHON%;%PYTHON%\scripts;%PATH%
   - echo "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\vcvars64.bat"
   - pip install -r dev-requirements.txt
 
 build: off
 
 test_script:
-  - tox
+  - pip install --upgrade --user pip setuptools
+  - pip install codecov
+  - python setup.py test
+  - codecov --required
 
 after_test:
-  - pip install codecov
-  - codecov
   - del bencoder.c
-  - tox -c tox-wheels.ini
+  - pip install wheel
+  - pip wheel . -w wheelhouse/
   - ps: "ls wheelhouse/*"
 
 deploy_script:

bencoder.pyx

@@ -12,20 +12,23 @@
 
 # Based on https://github.com/karamanolev/bencode3/blob/master/bencode.py
 
-__version__ = '1.1.2'
+__version__ = '1.1.3'
 
-import sys
-IS_PY2 = sys.version[0] == '2'
+import array
 
 try:
     from collections import OrderedDict
 except ImportError:
     from ordereddict import OrderedDict
 
+from cpython.version cimport PY_MAJOR_VERSION
+IS_PY2 = PY_MAJOR_VERSION == 2
 if IS_PY2:
     END_CHAR = 'e'
+    ARRAY_TYPECODE = b'b'
 else:
     END_CHAR = ord('e')
+    ARRAY_TYPECODE = 'b'
 
 
 class BTFailure(Exception):
@@ -34,7 +37,7 @@ class BTFailure(Exception):
 
 def decode_int(bytes x, int f):
     f += 1
-    new_f = x.index(b'e', f)
+    cdef long new_f = x.index(b'e', f)
     n = int(x[f:new_f])
     if x[f] == b'-'[0]:
         if x[f + 1] == b'0'[0]:
@@ -45,8 +48,8 @@ def decode_int(bytes x, int f):
 
 
 def decode_string(bytes x, int f):
-    colon = x.index(b':', f)
-    n = int(x[f:colon])
+    cdef long colon = x.index(b':', f)
+    cdef long n = int(x[f:colon])
     if x[f] == b'0'[0] and colon != f + 1:
         raise ValueError()
     colon += 1
@@ -62,7 +65,8 @@ def decode_list(bytes x, int f):
 
 
 def decode_dict(bytes x, int f):
-    r, f = OrderedDict(), f + 1
+    r = OrderedDict()
+    f += 1
     while x[f] != END_CHAR:
         k, f = decode_string(x, f)
         r[k], f = decode_func[x[f]](x, f)
@@ -107,56 +111,63 @@ def encode(v, r):
     )
 
 
-def encode_int(x, list r):
-    r.extend((b'i', str(x).encode(), b'e'))
+def encode_int(long x, r):
+    r.fromstring(b'i')
+    r.fromstring(str(x).encode())
+    r.fromstring(b'e')
 
 
-def encode_bool(x, list r):
-    if x:
-        encode_int(1, r)
-    else:
-        encode_int(0, r)
+def encode_long(x, r):
+    r.fromstring(b'i')
+    r.fromstring(str(x).encode())
+    r.fromstring(b'e')
+
+
+def encode_bytes(bytes x, r):
+    r.fromstring(str(len(x)).encode())
+    r.fromstring(b':')
+    r.fromstring(x)
 
 
-def encode_string(x, list r):
-    if isinstance(x, str):
-        x = x.encode()
-    r.extend((str(len(x)).encode(), b':', x))
+def encode_string(str x, r):
+    r.fromstring(str(len(x)).encode())
+    r.fromstring(b':')
+    r.fromstring(x.encode())
 
 
-def encode_list(x, list r):
-    r.append(b'l')
+def encode_list(x, r):
+    r.fromstring(b'l')
     for i in x:
         encode(i, r)
-    r.append(b'e')
+    r.fromstring(b'e')
 
 
-def encode_dict(x, list r):
-    r.append(b'd')
+def encode_dict(x, r):
+    r.fromstring(b'd')
     item_list = list(x.items())
     item_list.sort()
     for k, v in item_list:
         if isinstance(k, str):
             k = k.encode()
-        r.extend((str(len(k)).encode(), b':', k))
+        encode_bytes(k, r)
         encode(v, r)
-    r.append(b'e')
+    r.fromstring(b'e')
 
 
 encode_func = {
     int: encode_int,
-    long: encode_int,
-    bytes: encode_string,
+    bool: encode_int,    
+    long: encode_long,
+    bytes: encode_bytes,
     str: encode_string,
     list: encode_list,
     tuple: encode_list,
     dict: encode_dict,
     OrderedDict: encode_dict,
-    bool: encode_bool,
 }
 
 
 def bencode(x):
-    r = []
+    r = array.array(ARRAY_TYPECODE)
     encode(x, r)
-    return b''.join(r)
+    return r.tostring()

ci/build-wheels.sh

@@ -19,6 +19,6 @@ cp /tmp/wheelhouse/ordereddict* /io/wheelhouse
 # Install packages and test again
 for PYBIN in /opt/python/*/bin/; do
     ${PYBIN}/pip install bencoder.pyx --no-index -f /io/wheelhouse
-    ${PYBIN}/pip install pytest
+    ${PYBIN}/pip install pytest pytest-benchmark
     (cd /io; ${PYBIN}/py.test)
 done

dev-requirements.txt

@@ -1,4 +1,5 @@
 pytest
+pytest-benchmark
 coverage
 cython
 tox

pytest.ini

@@ -1 +1,5 @@
 [bdist_wheel]
+
+[pytest]
+testpaths = tests
+addopts = -rw

setup.cfg

@@ -11,36 +11,42 @@
 if version < ('2', '7'):
     install_requires.append('ordereddict>=1.1')
 
-base_path = os.path.dirname(os.path.abspath(__file__))
-pyx_path = os.path.join(base_path, 'bencoder.pyx')
-c_path = os.path.join(base_path, 'bencoder.c')
+pyx_path = 'bencoder.pyx'
+c_path = 'bencoder.c'
 
-if 'test' in sys.argv and platform.python_implementation() == 'CPython':
+try:
+    import Cython
+    HAVE_CYTHON = True
+except ImportError:
+    HAVE_CYTHON = False
+
+if HAVE_CYTHON:
     if os.path.exists(c_path):
         # Remove C file to force Cython recompile.
         os.remove(c_path)
-    from Cython.Compiler.Options import directive_defaults
-
-    directive_defaults['linetrace'] = True
-    directive_defaults['binding'] = True
-
-    from Cython.Build import cythonize
-    ext_modules = cythonize(Extension(
-        "bencoder",
-        [pyx_path],
-        define_macros=[('CYTHON_TRACE', '1')] 
-    ))
-elif os.path.exists(c_path):
+    if 'test' in sys.argv and platform.python_implementation() == 'CPython':
+        from Cython.Compiler.Options import directive_defaults
+
+        directive_defaults['linetrace'] = True
+        directive_defaults['binding'] = True
+
+        from Cython.Build import cythonize
+        ext_modules = cythonize(Extension(
+            "bencoder",
+            [pyx_path],
+            define_macros=[('CYTHON_TRACE', '1')] 
+        ))
+    else:
+        from Cython.Build import cythonize
+        ext_modules = cythonize(Extension(
+            "bencoder",
+            [pyx_path]
+        ))
+else:
     ext_modules = [Extension(
         'bencoder',
         [c_path]
     )]
-else:
-    from Cython.Build import cythonize
-    ext_modules = cythonize(Extension(
-        "bencoder",
-        [pyx_path]
-    ))
 
 
 class PyTest(TestCommand):
@@ -93,7 +99,7 @@ def get_tag(self):
 
 setup(
     name='bencoder.pyx',
-    version='1.1.2',
+    version='1.1.3',
     description='Yet another bencode implementation in Cython',
     long_description=open('README.rst', 'r').read(),
     author='whtsky',
@@ -121,12 +127,12 @@ def get_tag(self):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Utilities',
     ],
     ext_modules=ext_modules,
     install_requires=install_requires,
-    setup_requires=[
-        'pytest-runner',
-    ],
     tests_require=['cython', 'pytest', 'coverage'],
 )

setup.py

@@ -10,34 +10,37 @@
 )
 
 
-def test_decode_str():
-    assert bdecode(b'6:WWWWWW') == b"WWWWWW"
+def test_decode_str(benchmark):
+    assert benchmark(bdecode, b'6:WWWWWW') == b"WWWWWW"
 
 
-def test_decode_int():
-    assert bdecode(b'i233e') == 233
+def test_decode_int(benchmark):
+    assert benchmark(bdecode, b'i233e') == 233
 
 
-def test_decode_large_int():
+def test_decode_large_int(benchmark):
     assert bdecode(b'i1455189890e') == 1455189890
     assert bdecode(b'i25735241490e') == 25735241490
-    assert bdecode(('i%de' % sys.maxsize).encode()) == sys.maxsize
 
+    MAX_SIZE = sys.maxsize + 1
+    BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()
+    assert benchmark(bdecode, BENCODED_MAXSIZE) == MAX_SIZE
 
-def test_decode_list():
-    assert bdecode(b'l1:a1:bi3ee') == [b'a', b'b', 3]
 
+def test_decode_list(benchmark):
+    assert benchmark(bdecode, b'l1:a1:bi3ee') == [b'a', b'b', 3]
 
-def test_decode_dict():
+
+def test_decode_dict(benchmark):
     od = dict()
     od[b'ka'] = b'va'
     od[b'kb'] = 2
-    assert bdecode(b'd2:ka2:va2:kbi2ee') == od
+    assert benchmark(bdecode, b'd2:ka2:va2:kbi2ee') == od
 
 
-def test_ordered_dict():
+def test_ordered_dict(benchmark):
     from bencoder import OrderedDict
-    rv = bdecode(b'd2:ka2:va2:kbi2ee')
+    rv = benchmark(bdecode, b'd2:ka2:va2:kbi2ee')
     assert isinstance(rv, OrderedDict)
     assert list(rv.keys()) == [b'ka', b'kb']
     assert list(bdecode(b'd2:kc2:va2:kei2ee').keys()) == [b'kc', b'ke']