Merge pull request #71 from bobleesj/cookie-pass-test

Pass unit tests on Python 3.7

Author: sbillinge

src/diffpy/srfit/tests/testliterals.py

@@ -112,7 +112,7 @@ def testAddLiteral(self):
         """Test adding a literal to an operator node."""
         op = self.op
 
-        self.assertRaises(ValueError, op.getValue)
+        self.assertRaises(TypeError, op.getValue)
         op._value = 1
         self.assertEqual(op.getValue(), 1)
 
@@ -121,7 +121,7 @@ def testAddLiteral(self):
         b = literals.Argument(name="b", value=0)
 
         op.addLiteral(a)
-        self.assertRaises(ValueError, op.getValue)
+        self.assertRaises(TypeError, op.getValue)
 
         op.addLiteral(b)
         self.assertAlmostEqual(0, op.value)

src/diffpy/srfit/tests/testvisitors.py

@@ -195,7 +195,7 @@ def testSimpleFunction(self):
         self.assertTrue(plus2.hasObserver(mult._flush))
 
         # plus2 has no arguments yet. Verify this.
-        self.assertRaises(ValueError, mult.getValue)
+        self.assertRaises(TypeError, mult.getValue)
         # Add the arguments to plus2.
         plus2.addLiteral(v4)
         plus2.addLiteral(v5)