Merge lp:~simon-d-bull/htd/3.1.fix_parameter_type_checks into lp:htd/3.1

[Simon Bull]

Parameter type check improvements. Fixes bug 1036377 and bug 1036395.

[Andrew Hayzen (ahayzen)]

review: Approve

=== modified file 'htd31/__init__.py'
--- htd31/__init__.py	2012-09-22 17:18:43 +0000
+++ htd31/__init__.py	2012-09-26 17:14:20 +0000
@@ -165,13 +165,24 @@
 
 
 @_base.trace.trace
-def create(location, identifier=None, attributes={}, users=None,
-           login_user=None, htd_file=None):
+def create(location, identifier=None, attributes={}, users={}, login_user=None,
+           htd_file=None):
     """
     Create a new HTD File
     To create a table parse the identifier for the table otherwise leave
     the identifier blank to create a db
     """
+    # Confirm location is str
+    if not isinstance(location, str):
+        raise ValueError("location (%s) must be a str object." % location)
+
+    # Confirm attributes is dict
+    if not isinstance(attributes, dict):
+        raise ValueError("attributes (%s) must be a dict object." % attributes)
+
+    # Confirm users is dict
+    if not isinstance(users, dict):
+        raise ValueError("users (%s) must be a dict object." % users)
 
     # Check for identifier
     if identifier is not None:
@@ -213,14 +224,10 @@
 
     # Load guest account if needed
     guest = False
-    if users is None or len(users) == 0:
+    if len(users) == 0:
         users = {"guest": User(None)}
         guest = True
 
-    # Confirm users is dict
-    if not isinstance(users, dict):
-        raise ValueError("users (%s) must be a dict object." % users)
-
     # Confirm users are valid
     acc = False
 

=== modified file 'htd31/_objects/connection.py'
--- htd31/_objects/connection.py	2012-09-21 13:24:18 +0000
+++ htd31/_objects/connection.py	2012-09-26 17:14:20 +0000
@@ -39,6 +39,10 @@
         self.alive = True
         self._children = []
 
+        # Confirm location is str
+        if not isinstance(location, str):
+            raise ValueError("location (%s) must be a str object." % location)
+
         # Load user
         if user is None:
             user = Authenticate("guest", None)