Raise TypeError on invalid init or call argument.

Do not apply keyword arguments unless they are all valid.

Author: pavoljuhas

Diff for: diffpy/srreal/tests/testbondcalculator.py

@@ -37,6 +37,10 @@ def test___init__(self):
         self.assertEqual(0, self.bdc.rmin)
         self.assertEqual(5, self.bdc.rmax)
         self.assertEqual(0, len(self.bdc.distances))
+        bdc1 = BondCalculator(rmin=2, rmax=7)
+        self.assertEqual(2, bdc1.rmin)
+        self.assertEqual(7, bdc1.rmax)
+        self.assertRaises(TypeError, BondCalculator, invalid=55)
         return
 
 
@@ -51,6 +55,9 @@ def test___call__(self):
         self.assertEqual(0, len(bdc(self.niprim)))
         bdc.rmax = 2.5
         self.assertEqual(12, len(bdc(self.niprim)))
+        self.assertEqual(0, len(bdc(self.niprim, rmax=2)))
+        self.assertRaises(TypeError, bdc, self.niprim, rmax=5, invalid=7)
+        self.assertEqual(2, bdc.rmax)
         return
 
 

Diff for: diffpy/srreal/wraputils.py

@@ -40,19 +40,20 @@ def fset(self, value):
 
 
 def setattrFromKeywordArguments(obj, **kwargs):
-    '''Set attributes of the obj according to keywork arguments.
+    '''Set attributes of the obj according to keyword arguments.
     For example:    setattrFromKeywordArguments(obj, qmax=24, scale=2)
     This is a shared helper function used by __init__ and __call__.
 
     kwargs   -- one or more keyword arguments
 
     No return value.
-    Raise ValueError for invalid keyword argument.
+    Raise TypeError for invalid keyword argument.
     '''
-    for n, v in kwargs.iteritems():
+    for n in kwargs:
         if not hasattr(obj, n):
-            emsg = "Unknown attribute %r" % n
-            raise ValueError(emsg)
+            emsg = "Invalid keyword argument %r" % n
+            raise TypeError(emsg)
+    for n, v in kwargs.iteritems():
         setattr(obj, n, v)
     return