Merge calibaration branch into master.

This feature branch adds support for loading and applying calibration
files, as well as for loading soft calibration converters.

diff --git a/test.sh b/test.sh
index 0cc185fd502c8e291931e141577d8bf109034ff7..b5ea21ecea4aa9d8c069beba4d5b9daf37a70633 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -6,7 +6,7 @@ nosetests --with-doctest pycomedi
 ls pycomedi | grep '.pyx$'| while read file; do
   mod="${file/.pyx/}"
   echo "$mod"
-  python -c "import doctest, sys; import pycomedi.$mod as m; r = doctest.testmod(m); print r; sys.exit(r.failed)"
+  python -c "import doctest, sys; import pycomedi.$mod as m; r = doctest.testmod(m); print(r); sys.exit(r.failed)"
 done
 nosetests --with-doctest --doctest-extension=.txt doc
 nosetests --with-doctest doc/demo/*.py