Remove six dependency during installation

.gitignore

@@ -25,3 +25,5 @@ couchdbkit.egg-info
 dist/
 doc/_build/
 distribute-*
+data
+jsonobject_couchdbkit.egg-info

.travis.yml

@@ -1,14 +1,28 @@
 language: python
 
 services:
-    - couchdb
+  - docker
 
-python:
-    - 2.6
-    - 2.7
+python: 2.7
+
+install:
+  - pip install -r requirements_dev.txt
+  - python setup.py install
+
+before_script:
+  - "docker run -d --name couchdb-cluster \
+    -p 5984:5984 \
+    -v $(pwd)/data:/usr/src/couchdb/dev/lib/ \
+    klaemo/couchdb:2.0-dev \
+    --with-admin-party-please \
+    --with-haproxy
+    -n 1"
+  - |
+    while :
+    do
+      curl http://localhost:5984/${db_name} -sv 2>&1 | grep '^< HTTP/.* 200 OK' && break || continue
+      sleep 1
+    done
 
-install: 
-    - pip install -r requirements_dev.txt --use-mirrors
-    - python setup.py install
 
 script: python setup.py test

README.rst

@@ -1,3 +1,10 @@
+About the jsonobject fork of couchdbkit
+---------------------------------------
+`jsonobject-couchdbkit`_ is a fork of couchdbkit that replaces couchdbkit.schema
+with a thin wrapper around jsonobject
+(which was, incidentally, written as a **way** faster replacement
+for couchdbkit.schema.) See `jsonobject`_.
+
 About
 -----
 
@@ -155,6 +162,8 @@ greets::
 
   greets = Greeting.view('greeting/all')
 
+.. _jsonobject-couchdbkit: https://github.com/dimagi/couchdbkit/tree/jsonobject
+.. _jsonobject: http://github.com/dimagi/jsonobject
 .. _Couchdbkit: http://couchdbkit.org
 .. _API: http://couchdbkit.org/doc/api/
 .. _couchapp:  http://github.com/couchapp/couchapp/tree/

couchdbkit/__init__.py

@@ -22,37 +22,11 @@
     Property, IntegerProperty, DecimalProperty, BooleanProperty, FloatProperty, StringProperty,
     DateTimeProperty, DateProperty, TimeProperty,
     dict_to_json, dict_to_json, dict_to_json,
-    value_to_python, dict_to_python,
+    dict_to_python,
     DocumentSchema, DocumentBase, Document, StaticDocument, contain,
     QueryMixin, AttachmentMixin,
     SchemaProperty, SchemaListProperty, SchemaDictProperty,
     ListProperty, DictProperty, StringDictProperty, StringListProperty, SetProperty
 )
 
-import logging
-
-LOG_LEVELS = {
-    "critical": logging.CRITICAL,
-    "error": logging.ERROR,
-    "warning": logging.WARNING,
-    "info": logging.INFO,
-    "debug": logging.DEBUG
-}
-
-def set_logging(level, handler=None):
-    """
-    Set level of logging, and choose where to display/save logs
-    (file or standard output).
-    """
-    if not handler:
-        handler = logging.StreamHandler()
-
-    loglevel = LOG_LEVELS.get(level, logging.INFO)
-    logger = logging.getLogger('couchdbkit')
-    logger.setLevel(loglevel)
-    format = r"%(asctime)s [%(process)d] [%(levelname)s] %(message)s"
-    datefmt = r"%Y-%m-%d %H:%M:%S"
-
-    handler.setFormatter(logging.Formatter(format, datefmt))
-    logger.addHandler(handler)
-
+from .logging import (LOG_LEVELS, set_logging, logger)