cleaning

Author: tariqdaouda

pyArango/database.py

@@ -46,7 +46,6 @@ def reloadCollections(self) :
 				else :
 					try :
 						colClass = COL.getCollectionClass(colName)
-						# if colName[0] != "_" :
 						colObj = colClass(self, colData)
 					except KeyError :
 						if colData["type"] == COL.COLLECTION_EDGE_TYPE :
@@ -163,13 +162,6 @@ def _checkCollectionList(lst) :
 			raise CreationError(data["errorMessage"], data)		
 		return self.graphs[name]
 
-	# def _checkGraphCollections(self, edgeDefinitions, orphanCollections) :
-	# 	for ed in edgeDefinitions :	
-	# 		checkList(ed["from"])
-	# 		checkList(ed["to"])
-		
-	# 	checkList(orphanCollections)
-
 	def hasCollection(self, name) :
 		"""returns true if the databse has a collection by the name of 'name'"""
 		return name in self.collections

pyArango/graph.py

@@ -92,20 +92,6 @@ def __init__(self, database, jsonInit) :
 				raise KeyError("'%s' is not a valid edge collection" % de.name)
 			self.definitions[de.name] = de
 
-		# for e in jsonInit["edgeDefinitions"] :
-		# 	if e["collection"] not in self._edgeDefinitions :
-		# 		raise CreationError("Collection '%s' is not mentioned in the definition of graph '%s'" % (e["collection"], self.__class__,__name__))
-		# 	if e["from"] != self._edgeDefinitions[e["collection"]]["from"] :
-		# 		vals = (e["collection"], self.__class__,__name__, self._edgeDefinitions[e["collection"]]["from"], e["from"])
-		# 		raise CreationError("Edge definition '%s' of graph '%s' mismatch for 'from':\npython:%s\narangoDB:%s" % vals)
-		# 	if e["to"] != self._edgeDefinitions[e["collection"]]["to"] :
-		# 		vals = (e["collection"], self.__class__,__name__, self._edgeDefinitions[e["collection"]]["to"], e["to"])
-		# 		raise CreationError("Edge definition '%s' of graph '%s' mismatch for 'to':\npython:%s\narangoDB:%s" % vals )
-		# 	defs.append(e["collection"])
-
-		# if jsonInit["orphanCollections"] != self._orphanCollections :
-		# 	raise CreationError("Orphan collection '%s' of graph '%s' mismatch:\npython:%s\narangoDB:%s" (e["collection"], self.__class__,__name__, self._orphanCollections, jsonInit["orphanCollections"]))
-			
 		self.URL = "%s/%s" % (self.database.graphsURL, self._key)
 
 	def createVertex(self, collectionName, docAttributes, waitForSync = False) :

pyArango/tests/tests.py

@@ -651,11 +651,7 @@ def test_transaction_exception(self) :
     except NameError :
         pass
 
-    ROOT_USERNAME = input("Please enter root username: ")
+    ROOT_USERNAME = input("Please enter root username: ") 
     ROOT_PASSWORD = input("Please entre root password: ")
 
-    # print "Warning should ask for the root pass"
-    # ROOT_USERNAME = "root"
-    # ROOT_PASSWORD = "root"
-
     unittest.main()