Fix deprecation and resource warnings (#362)

fix deprecation and resource warning

src/App/tests/testImageFile.py

@@ -67,3 +67,4 @@ def test_index_html(self):
         self.assertIsInstance(result, io.FileIO)
         self.assertTrue(b''.join(result).startswith(b'\x89PNG\r\n'))
         self.assertEqual(len(result), image.size)
+        result.close()

src/ZPublisher/tests/test_xmlrpc.py

@@ -50,9 +50,9 @@ def test_setBody(self):
         as_set, method = xmlrpclib.loads(body_str)
         as_set = as_set[0]
 
-        self.assertEqual(method, None)
-        self.assertFalse('_secret' in as_set.keys())
-        self.assertTrue('public' in as_set.keys())
+        self.assertIsNone(method)
+        self.assertNotIn('_secret', as_set.keys())
+        self.assertIn('public', as_set.keys())
         self.assertEqual(as_set['public'], 'def')
 
     def test_nil(self):
@@ -61,7 +61,7 @@ def test_nil(self):
         response = self._makeOne(faux)
         response.setBody(body)
         data, method = xmlrpclib.loads(faux._body)
-        self.assert_(data[0]['public'] is None)
+        self.assertIs(data[0]['public'], None)
 
     def test_instance(self):
         # Instances are turned into dicts with their private