Merge branch 'develop'

Author: Synss

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+plugins = Cython.Coverage

.gitignore

@@ -8,6 +8,9 @@ __pycache__/
 # C source file generated by Cython
 # *.c
 
+# HTML files
+*.html
+
 # Distribution / packaging
 .Python
 env/
@@ -45,6 +48,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+./cover
 
 # Translations
 *.mo

Makefile

@@ -1,13 +1,21 @@
 .DEFAULT_GOAL := debug
 
+PYX  = $(wildcard mbedtls/*.pyx)
+PYX += $(wildcard mbedtls/cipher/*.pyx)
+PYX += $(wildcard mbedtls/pk/*.pyx)
+
 release:
+	cython $(PYX)
 	python setup.py build_ext
 
 debug:
-	python setup.py build_ext --inplace
+	cython -a -X linetrace=True $(PYX)
+	CFLAGS='-DCYTHON_TRACE=1' python setup.py build_ext --inplace
 
 test:
-	nosetests -v tests
+	nosetests -v \
+		--with-coverage --cover-package=mbedtls \
+		tests
 
 html:
 	cd docs && make html

docs/conf.py

@@ -67,7 +67,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = '0.5'
 # The full version, including alpha/beta/rc tags.
 release = version
 

setup.py

@@ -1,33 +1,22 @@
+import os
 from setuptools import setup, Extension
 
 
-version = "0.4"
+version = "0.5"
 download_url = "https://github.com/Synss/python-mbedtls/tarball/%s" % version
 
 
-extensions = [
-    Extension("mbedtls.exceptions", ["mbedtls/exceptions.c"]),
-] + [
-    Extension("mbedtls.random", ["mbedtls/random.c"],
-              libraries=["mbedtls"],
-              include_dirs=["."],)
-] + [
-    Extension("mbedtls.cipher.%s" % name, ["mbedtls/cipher/%s.c" % name],
-              libraries=["mbedtls"],
-              include_dirs=["."],) for name in
-    "_cipher __init__".split() +
-    "AES ARC4 Blowfish Camellia DES DES3 DES3dbl".split()
-] + [
-    Extension("mbedtls.pk.%s" % name, ["mbedtls/pk/%s.c" % name],
-              libraries=["mbedtls"],
-              include_dirs=["."],) for name in
-    "_pk __init__ RSA".split()
-] + [
-    Extension("mbedtls.%s" % name, ["mbedtls/%s.c" % name],
-              libraries=["mbedtls"],
-              include_dirs=["."],)
-    for name in "_md __init__ hash hmac".split()
-]
+extensions = []
+for dirpath, dirnames, filenames in os.walk("mbedtls"):
+    for fn in filenames:
+        root, ext = os.path.splitext(fn)
+        if ext != ".c":
+            continue
+        mod = ".".join(dirpath.split(os.sep) + [root])
+        extensions.append(Extension(
+            mod, [os.path.join(dirpath, fn)],
+            libraries=["mbedtls"], include_dirs=["."]))
+
 
 setup(
     name="python-mbedtls",