py3 tests ok

Author: tariqdaouda

pyArango/document.py

@@ -75,8 +75,6 @@ def validate(self) :
         res = {}
         for field in self.validators.keys() :
             try :
-                # print field, self.store[field]
-                # if type(self.validators[field]) is types.DictType and field not in self.store :
                 if isinstance(self.validators[field], dict) and field not in self.store :
                     self.store[field] = DocumentStore(self.collection, validators = self.validators[field], initDct = {}, subStore=True)
                 self.validateField(field)
@@ -99,7 +97,6 @@ def set(self, dct) :
 
         for field, value in dct.items() :
             if field not in self.collection.arangoPrivates :
-                # if type(value) is types.DictType :
                 if isinstance(value, dict) :
                     if field in self.validators :
                         vals = self.validators[field]
@@ -112,7 +109,6 @@ def set(self, dct) :
 
     def __getitem__(self, field) :
         """Get an element from the store"""
-        # if (field in self.validators) and (type(self.validators[field]) is types.DictType) and (field not in self.store) :
         if (field in self.validators) and isinstance(self.validators[field], dict) and (field not in self.store) :
             self.store[field] = DocumentStore(self.collection, validators = self.validators[field], initDct = {}, patch = self.patching, subStore=True)
             self.subStores[field] = self.store[field]
@@ -134,7 +130,6 @@ def __setitem__(self, field, value) :
         if field in self.collection.arangoPrivates :
             raise ValueError("DocumentStore cannot contain private field (got %s)" % field)
 
-        # if type(value) is types.DictType :
         if isinstance(value, dict) :
             if field in self.validators :
                 vals = self.validators[field]

pyArango/tests/tests.py

@@ -309,7 +309,7 @@ def test_fields_on_save(self) :
         class String_val(VAL.Validator) :
 
             def validate(self, value) :
-                if type(value) is not bytes :
+                if not isinstance(value, bytes) and not isinstance(value, str) :
                     raise ValidationError("Field value must be a string")
                 return True
 

pyArango/theExceptions.py

@@ -53,7 +53,7 @@ def __init__(self, errors) :
         pyArangoException.__init__(self, message, errors)
 
     def __str__(self) :
-        self.rors = []
+        self.strErrors = []
         for k, v in self.errors.items() :
             strErrors.append("%s -> %s" % (k, v))
         strErrors = '\n\t'.join(strErrors)