Fixed a few more examples of 'd.has_key(k)' to use 'k in d' instead.

Tests/test_Crystal.py

@@ -476,9 +476,9 @@ def testKeys(self):
         self.assertEqual(self.crystal.keys(), self.crystal.data.keys())
 
     def testHasKey(self):
-        self.assertTrue(self.crystal.has_key('b'))
-        self.assertTrue(self.crystal.has_key('c'))
-        self.assertFalse(self.crystal.has_key('z'))
+        self.assertTrue('b' in self.crystal)
+        self.assertTrue('c' in self.crystal)
+        self.assertFalse('z' in self.crystal)
 
 
 class HeteroTestCase(unittest.TestCase):

Tests/test_GFF.py

@@ -6,7 +6,7 @@
 
 # only do the test if we are set up to do it. We need to have MYSQLPASS
 # set and have a GFF wormbase installed (see the code in Bio/GFF/__init_.py
-if not os.environ.has_key("MYSQLPASS"):
+if "MYSQLPASS" not in os.environ:
     raise MissingExternalDependencyError("Environment is not configured for this test (not important if you do not plan to use Bio.GFF).")
 
 import warnings

Tests/test_GraphicsChromosome.py

@@ -239,18 +239,17 @@ def test_widget(self):
         properties = new_stdout.getvalue()
         sys.stdout = save_stdout
 
-        assert properties.find(expected_string) >= 0, \
-               "Unexpected results from dumpProperties: \n %s" % properties
+        self.assertTrue(properties.find(expected_string) >= 0,
+               "Unexpected results from dumpProperties: \n %s" % properties)
 
         properties = test_widget.getProperties()
-        assert properties.has_key("label_size") \
-               and properties["label_size"] == 6, \
-               "Unexpected results from getProperties: %s" % properties
+        self.assertEqual(properties["label_size"], 6, 
+               "Unexpected results from getProperties: %s" % properties)
 
         test_widget.setProperties({"start_x_position" : 12})
-        assert test_widget.start_x_position == 12, \
+        self.assertEqual(test_widget.start_x_position, 12,
                "setProperties doesn't seem to work right: %s" \
-               % test_widget.start_x_position
+               % test_widget.start_x_position)
 
 class ChromosomeCountTest(unittest.TestCase):
     """Test the display representation for simple counts on a chromosome.

Tests/test_Wise.py

@@ -9,7 +9,7 @@
 import doctest, unittest
 import sys
 
-if sys.modules.has_key('requires_wise'):
+if 'requires_wise' in sys.modules:
     del sys.modules['requires_wise']
 import requires_wise
 

Tests/test_psw.py

@@ -9,7 +9,7 @@
 import random
 import sys
 
-if sys.modules.has_key('requires_wise'):
+if 'requires_wise' in sys.modules:
     del sys.modules['requires_wise']
 import requires_wise