Add python3 compatibility

Author: Joohwan Oh

arango/__init__.py

@@ -167,4 +167,4 @@ def remove_database(self, name):
 
 if __name__ == "__main__":
     a = Arango()
-    print a.version
+    print(a.version)

arango/api.py

@@ -3,6 +3,7 @@
 import json
 
 from arango.clients.default import DefaultArangoClient
+from arango.utils import is_string
 
 
 class ArangoAPI(object):
@@ -44,13 +45,13 @@ def url_prefix(self):
         :rtype: str
         """
         return "{protocol}://{host}:{port}/_db/{db}".format(
-            protocol = self.protocol,
-            host = self.host,
-            port = self.port,
-            db = self.db_name,
+            protocol=self.protocol,
+            host=self.host,
+            port=self.port,
+            db=self.db_name,
         )
 
-    def head(self, path, params=None, headers=None, batch=False):
+    def head(self, path, params=None, headers=None):
         """Execute an HTTP HEAD method."""
         return self.client.head(
             url=self.url_prefix + path,
@@ -59,7 +60,7 @@ def head(self, path, params=None, headers=None, batch=False):
             auth=(self.username, self.password)
         )
 
-    def get(self, path, params=None, headers=None, batch=False):
+    def get(self, path, params=None, headers=None):
         """Execute an HTTP GET method."""
         return self.client.get(
             url=self.url_prefix + path,
@@ -68,37 +69,37 @@ def get(self, path, params=None, headers=None, batch=False):
             auth=(self.username, self.password),
         )
 
-    def put(self, path, data=None, params=None, headers=None, batch=False):
+    def put(self, path, data=None, params=None, headers=None):
         """Execute an HTTP PUT method."""
         return self.client.put(
             url=self.url_prefix + path,
-            data=data if isinstance(data, basestring) else json.dumps(data),
+            data=data if is_string(data) else json.dumps(data),
             params=params,
             headers=headers,
             auth=(self.username, self.password)
         )
 
-    def post(self, path, data=None, params=None, headers=None, batch=False):
+    def post(self, path, data=None, params=None, headers=None):
         """Execute an HTTP POST method."""
         return self.client.post(
             url=self.url_prefix + path,
-            data=data if isinstance(data, basestring) else json.dumps(data),
+            data=data if is_string(data) else json.dumps(data),
             params=params,
             headers=headers,
             auth=(self.username, self.password)
         )
 
-    def patch(self, path, data=None, params=None, headers=None, batch=False):
+    def patch(self, path, data=None, params=None, headers=None):
         """Execute an HTTP PATCH method."""
         return self.client.patch(
             url=self.url_prefix + path,
-            data=data if isinstance(data, basestring) else json.dumps(data),
+            data=data if is_string(data) else json.dumps(data),
             params=params,
             headers=headers,
             auth=(self.username, self.password)
         )
 
-    def delete(self, path, params=None, headers=None, batch=False):
+    def delete(self, path, params=None, headers=None):
         """Execute an HTTP DELETE method."""
         return self.client.delete(
             url=self.url_prefix + path,

arango/batch.py

@@ -1,7 +1,9 @@
 import json
 import inspect
-from urllib import urlencode
-
+try:
+    from urllib import urlencode
+except ImportError:
+    from urllib.parse import urlencode
 from arango.exceptions import (
     BatchInvalidError,
     BatchExecuteError
@@ -53,7 +55,7 @@ def stringify_request(method, path, params=None, headers=None, data=None):
     path = path + "?" + urlencode(params) if params else path
     request_string = "{} {} HTTP/1.1".format(method, path)
     if headers:
-        for key, value in headers.iteritems():
+        for key, value in headers.items():
             request_string += "\r\n{key}: {value}".format(
                 key=key, value=value
             )

arango/exceptions.py

@@ -66,6 +66,7 @@ class DatabaseRemoveError(ArangoRequestError):
 # Collections #
 ###############
 
+
 class CollectionCorruptedError(Exception):
     """The collection is corrupted (unknown status)."""
 
@@ -125,6 +126,7 @@ class CollectionBulkImportError(ArangoRequestError):
 # Documents #
 #############
 
+
 class DocumentInvalidError(Exception):
     """The document is invalid."""
 
@@ -229,6 +231,7 @@ class IndexRemoveError(ArangoRequestError):
 # Queries #
 ###########
 
+
 class QueryExplainError(ArangoRequestError):
     """Failed to explain the query."""
 
@@ -260,6 +263,7 @@ class AQLFunctionRemoveError(ArangoRequestError):
 # Simple Queries #
 ##################
 
+
 class SimpleQueryGetByExampleError(ArangoRequestError):
     """Failed to execute the ``by-example`` simple query."""
 
@@ -319,13 +323,15 @@ class SimpleQueryError(ArangoRequestError):
 # Transactions #
 ################
 
+
 class TransactionExecuteError(ArangoRequestError):
     """Failed to execute a transaction."""
 
 ###########
 # Batches #
 ###########
 
+
 class BatchInvalidError(Exception):
     """The Batch request is malformed."""
 
@@ -337,6 +343,7 @@ class BatchExecuteError(ArangoRequestError):
 # Graphs #
 ##########
 
+
 class GraphNotFoundError(ArangoNotFoundError):
     """Failed to find the graph."""
 
@@ -368,6 +375,7 @@ class GraphTraversalError(ArangoRequestError):
 # Vertex Collections #
 ######################
 
+
 class VertexCollectionListError(ArangoRequestError):
     """Failed to list the vertex collections."""
 
@@ -383,6 +391,7 @@ class VertexCollectionRemoveError(ArangoRequestError):
 # Edge Collections/Definitions #
 ################################
 
+
 class EdgeDefinitionListError(ArangoRequestError):
     """Failed to list the edge collections."""
 

arango/graph.py

@@ -372,7 +372,7 @@ def remove_vertex(self, vertex_id, rev=None, wait_for_sync=False,
         :raises: RevisionMismatchError, VertexRemoveError
         """
         path = "/_api/gharial/{}/vertex/{}".format(self.name, vertex_id)
-        params={"waitForSync": wait_for_sync}
+        params = {"waitForSync": wait_for_sync}
         if rev is not None:
             params["rev"] = rev
         if _batch:
@@ -584,8 +584,8 @@ def remove_edge(self, edge_id, rev=None, wait_for_sync=False,
 
     def execute_traversal(self, start_vertex, direction=None,
             strategy=None, order=None, item_order=None, uniqueness=None,
-            max_iterations=None, min_depth=None, max_depth=None,
-            init=None, filters=None, visitor=None, expander=None, sort=None):
+            max_iterations=None, min_depth=None, max_depth=None, init=None,
+            filters=None, visitor=None, expander=None, sort=None):
         """Execute a graph traversal and return the visited vertices.
 
         For more details on ``init``, ``filter``, ``visitor``, ``expander``

arango/tests/test_aql_functions.py

@@ -65,4 +65,4 @@ def test_remove_aql_functions_by_group(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()

arango/tests/test_collection.py

@@ -4,11 +4,13 @@
 
 from arango import Arango
 from arango.exceptions import *
+from arango.utils import is_string
 from arango.tests.utils import (
     get_next_col_name,
     get_next_db_name
 )
 
+
 class CollectionManagementTest(unittest.TestCase):
 
     def setUp(self):
@@ -84,7 +86,7 @@ def test_collection_add_with_config(self):
         self.assertFalse(col.do_compact)
         self.assertTrue(col.wait_for_sync)
         self.assertTrue(col.is_edge)
-        self.assertTrue(isinstance(col.id, basestring))
+        self.assertTrue(is_string(col.id))
         self.assertTrue(isinstance(col.figures, dict))
 
     def test_collection_setters(self):
@@ -117,4 +119,3 @@ def test_collection_rotate_journal(self):
 
 if __name__ == "__main__":
     unittest.main()
-

arango/tests/test_database.py

@@ -1,19 +1,19 @@
 """Tests for ArangoDB Databases."""
 
 import unittest
+
 from arango import Arango
+from arango.utils import is_string
 from arango.tests.utils import (
     get_next_db_name
 )
 
+
 class DatabaseManagementTest(unittest.TestCase):
 
     def setUp(self):
         self.arango = Arango()
 
-    def tearDown(self):
-        self.arango = None
-
     def test_database_add_and_remove(self):
         db_name = get_next_db_name(self.arango)
         self.arango.add_database(db_name)
@@ -31,8 +31,8 @@ def test_database_properties(self):
         db = self.arango.database("_system")
         self.assertEqual(db.name, "_system")
         self.assertTrue(isinstance(db.properties, dict))
-        self.assertTrue(isinstance(db.id, basestring))
-        self.assertTrue(isinstance(db.path, basestring))
+        self.assertTrue(is_string(db.id))
+        self.assertTrue(is_string(db.path))
         self.assertEqual(db.is_system, True)
 
 

arango/tests/test_document.py

@@ -149,10 +149,9 @@ def test_last(self):
             strip_system_keys(self.col.last(1)),
             [{"name": "test_doc_03"}]
         )
-        self.assertEqual(
-            sorted(strip_system_keys(self.col.last(2))),
-            sorted([{"name": "test_doc_03"}, {"name": "test_doc_02"}])
-        )
+        docs = strip_system_keys(self.col.last(2))
+        self.assertIn({"name": "test_doc_03"}, docs)
+        self.assertIn({"name": "test_doc_02"}, docs)
 
     def test_all(self):
         self.assertEqual(list(self.col.all()), [])
@@ -162,14 +161,11 @@ def test_all(self):
             {"name": "test_doc_03"}
         ])
         self.assertEqual(len(self.col), 3)
-        self.assertEqual(
-            sorted(strip_system_keys(self.col.all())),
-            sorted([
-                {"name": "test_doc_01"},
-                {"name": "test_doc_02"},
-                {"name": "test_doc_03"}
-            ])
-        )
+
+        docs = strip_system_keys(self.col.all())
+        self.assertIn({"name": "test_doc_01"}, docs)
+        self.assertIn({"name": "test_doc_02"}, docs)
+        self.assertIn({"name": "test_doc_03"}, docs)
 
     def test_any(self):
         self.assertEqual(strip_system_keys(self.col.all()), [])
@@ -210,13 +206,9 @@ def test_get_by_example(self):
             {"name": "test_doc_02", "value": 1},
             {"name": "test_doc_03", "value": 3}
         ])
-        self.assertEqual(
-            sorted(strip_system_keys(self.col.get_by_example({"value": 1}))),
-            sorted([
-                {"name": "test_doc_01", "value": 1},
-                {"name": "test_doc_02", "value": 1},
-            ])
-        )
+        docs = strip_system_keys(self.col.get_by_example({"value": 1}))
+        self.assertIn({"name": "test_doc_01", "value": 1}, docs)
+        self.assertIn({"name": "test_doc_02", "value": 1}, docs)
         self.assertEqual(
             strip_system_keys(self.col.get_by_example({"value": 2})), []
         )
@@ -231,14 +223,10 @@ def test_update_by_example(self):
             {"name": "test_doc_03", "value": 3}
         ])
         self.col.update_by_example({"value": 1}, {"value": 2})
-        self.assertEqual(
-            sorted(strip_system_keys(self.col.all())),
-            sorted([
-                {"name": "test_doc_01", "value": 2},
-                {"name": "test_doc_02", "value": 2},
-                {"name": "test_doc_03", "value": 3}
-            ])
-        )
+        docs = strip_system_keys(self.col.all())
+        self.assertIn({"name": "test_doc_01", "value": 2}, docs)
+        self.assertIn({"name": "test_doc_02", "value": 2}, docs)
+        self.assertIn({"name": "test_doc_03", "value": 3}, docs)
 
     def test_replace_by_example(self):
         self.col.bulk_import([
@@ -247,14 +235,10 @@ def test_replace_by_example(self):
             {"name": "test_doc_03", "value": 3}
         ])
         self.col.replace_by_example({"value": 1}, {"foo": "bar"})
-        self.assertEqual(
-            sorted(strip_system_keys(self.col.all())),
-            sorted([
-                {"foo": "bar"},
-                {"foo": "bar"},
-                {"name": "test_doc_03", "value": 3}
-            ])
-        )
+
+        docs = strip_system_keys(self.col.all())
+        self.assertIn({"foo": "bar"}, docs)
+        self.assertIn({"name": "test_doc_03", "value": 3}, docs)
 
     def test_remove_by_example(self):
         self.col.bulk_import([