Merge 7fbcb2b into 35324b2

dimagi · Dec 20, 2013 · 33543bf · 33543bf
2 parents 35324b2 + 7fbcb2b
commit 33543bf
Show file tree

Hide file tree

Showing 13 changed files with 129 additions and 1,096 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ install:
  - "pip install -e ."
  - "pip install pytz requests simplejson mock unittest2"
  - "pip install coverage coveralls"
+ - "pip install git+https://github.com/dimagi/xml2json"
 script: "coverage run `which django-admin.py` test --traceback couchforms --verbosity 2"
 after_success:
  - coveralls

diff --git a/couchforms/__init__.py b/couchforms/__init__.py
@@ -1,2 +1,4 @@
+from .util import create_xform_from_xml
+from .exceptions import XMLSyntaxError, CouchFormException
 from .getters import *
 from .util import SubmissionPost
diff --git a/couchforms/_design/updates/xform.js b/couchforms/_design/updates/xform.js
diff --git a/couchforms/_design/util/base64.js b/couchforms/_design/util/base64.js
diff --git a/couchforms/_design/util/dateFormat.js b/couchforms/_design/util/dateFormat.js
diff --git a/couchforms/_design/util/hello.js b/couchforms/_design/util/hello.js