Merge branch 'master' into dev

Author: tariqdaouda

CHANGELOG.rst

@@ -8,6 +8,7 @@
 
 * Fixed max retries for write conflicts
 * Added parameter ``pool_maxsize`` on class ``Connection`` to allow user configure the http pool size.
+=======
 
 2.0
 =====
@@ -16,7 +17,6 @@
 * added to_default function to reset a document to its default values
 * fixed bug in default documents where default values could be overwritten
 * default value for fields is now None
-* default value for fields can now be a callable
 
 1.3.5
 =====

pyArango/collection.py

@@ -274,6 +274,7 @@ def getDefaultDocument(self, fields=None, dct=None):
                 dct[k] = self.getDefaultDocument(fields[k], None)
             elif isinstance(v, list) or isinstance(v, tuple):
                 dct[k] = []
+
             elif isinstance(v, Field):
                 if callable(v.default):
                     dct[k] = v.default()
@@ -934,3 +935,4 @@ def __enter__(self):
         return self.coll
     def __exit__(self, type, value, traceback):
         self.coll._finalizeBatch();
+

pyArango/doc/source/index.rst

@@ -74,7 +74,6 @@ Contents:
    users
    query
    graph
-   users
    exceptions
    validation
    admin