Merge lp:~jkakar/txaws/silence-deprecation-warnings into lp:txaws

[Jamu Kakar]

This branch introduces the following changes:

- Minor changes have been made to silence deprecation warnings
  generated by the test suite when run with Python 2.7.

[Duncan McGreggor (oubiwann)]

Note sure if you want to address Python 2.6 deprecation warnings at the same time:

    test_submit_400 ... [OK]
/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/client/base.py:40: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
    test_submit_500 ... [OK]
/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/client/base.py:40: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
    test_submit_non_EC2_400 ... [OK]
/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/client/base.py:40: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6

Changes look good; all tests pass on Python 2.6 and Python 2.7; +1 for merge, regardless what you want to do about the 2.6 exceptions.

review: Approve

[Jamu Kakar (jkakar)]

Duncan:

Interestingly, I don't get those warnings on Python 2.7... anyway,
I've made a change that should fix them. Can you please run the test
suite with Python 2.6 again and let me know if everything is fine?

[lp:~jkakar/txaws/silence-deprecation-warnings]

85. By Jamu Kakar on 2011-04-21

- Minor change to quell warnings on Python 2.6.

[Duncan McGreggor (oubiwann)]

Those are gone, but for some reason, new ones have shown up... odd :-/

/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/ec2/tests/test_client.py:1429: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/ec2/tests/test_client.py:1481: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/ec2/tests/test_client.py:1488: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6

[lp:~jkakar/txaws/silence-deprecation-warnings]

86. By Jamu Kakar on 2011-04-21

- Fixed more deprecation warnings for Python 2.6.

[Jamu Kakar (jkakar)]

Cool, I've fixed those and pushed new revisions. Can you please run
the tests again?

[Duncan McGreggor (oubiwann)]

Sure thing!

A new one popped up:

/mnt/oubiwann/lab/txAWS/branches/silence-deprecation-warnings/txaws/client/tests/test_client.py:44: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6

I did a quick grep through the source code, and that's the last 'error.message' I could see:

$ find txaws/|xargs grep -n 'error\.message'
txaws/client/tests/test_client.py:44: self.assertEquals(error.message, "timeout")

So hopefully we're good now :-)

/me crosses fingers

[Jamu Kakar (jkakar)]

Sorry for all this nonsense. I fixed the issue and also installed
python2.6 to make sure there aren't anymore. Using trial with a
non-/usr/bin/python sucks and is awesome at the same time:

python2.6 -c "from twisted.scripts.trial import run; run()" txaws
python2.7 -c "from twisted.scripts.trial import run; run()" txaws

The tests pass without deprecation warnings in both of these cases, so
I'm going to go ahead and merge.

=== modified file 'txaws/client/base.py'
--- txaws/client/base.py	2011-04-14 16:57:11 +0000
+++ txaws/client/base.py	2011-04-21 16:15:56 +0000
@@ -37,7 +37,7 @@
             error.raiseException()
         try:
             fallback_error = errorClass(
-                xml_payload, error.value.status, error.value.message,
+                xml_payload, error.value.status, str(error.value),
                 error.value.response)
         except (ParseError, AWSResponseParseError):
             error_message = http.RESPONSES.get(http_status)

=== modified file 'txaws/ec2/client.py'
--- txaws/ec2/client.py	2011-04-19 17:42:18 +0000
+++ txaws/ec2/client.py	2011-04-21 16:15:56 +0000
@@ -76,7 +76,7 @@
             "availabilityZone")
         products = []
         product_codes = instance_data.find("productCodes")
-        if product_codes:
+        if product_codes is not None:
             for product_data in instance_data.find("productCodes"):
                 products.append(product_data.text)
         kernel_id = instance_data.findtext("kernelId")
@@ -236,7 +236,9 @@
             owner_id = group_info.findtext("ownerId")
             allowed_groups = []
             allowed_ips = []
-            ip_permissions = group_info.find("ipPermissions") or ()
+            ip_permissions = group_info.find("ipPermissions")
+            if ip_permissions is None:
+                ip_permissions = ()
             for ip_permission in ip_permissions:
                 ip_protocol = ip_permission.findtext("ipProtocol")
                 from_port = int(ip_permission.findtext("fromPort"))
@@ -630,7 +632,7 @@
         results = []
         root = XML(xml_bytes)
         keypairs = root.find("keySet")
-        if not keypairs:
+        if keypairs is None:
             return results
         for keypair_data in keypairs:
             key_name = keypair_data.findtext("keyName")

=== modified file 'txaws/ec2/exception.py'
--- txaws/ec2/exception.py	2009-11-22 05:15:21 +0000
+++ txaws/ec2/exception.py	2011-04-21 16:15:56 +0000
@@ -10,7 +10,7 @@
     """
     def _set_400_error(self, tree):
         errors_node = tree.find(".//Errors")
-        if errors_node:
+        if errors_node is not None:
             for error in errors_node:
                 data = self._node_to_dict(error)
                 if data:

=== modified file 'txaws/ec2/tests/test_client.py'
--- txaws/ec2/tests/test_client.py	2011-04-19 17:42:18 +0000
+++ txaws/ec2/tests/test_client.py	2011-04-21 16:15:56 +0000
@@ -1426,7 +1426,7 @@
         self.assertEquals(failure.type, type(error))
         self.assertFalse(isinstance(error, EC2Error))
         self.assertTrue(isinstance(error, Exception))
-        self.assertEquals(error.message, "found")
+        self.assertEquals(str(error), "found")
 
     def test_400_error(self):
         failure = self.make_failure(400, TwistedWebError)
@@ -1478,14 +1478,14 @@
         error = self.assertRaises(Exception, client.ec2_error_wrapper, failure)
         self.assertFalse(isinstance(error, EC2Error))
         self.assertTrue(isinstance(error, Exception))
-        self.assertEquals(error.message, "A server error occurred")
+        self.assertEquals(str(error), "A server error occurred")
 
     def test_timeout_error(self):
         failure = self.make_failure(type=Exception, message="timeout")
         error = self.assertRaises(Exception, client.ec2_error_wrapper, failure)
         self.assertFalse(isinstance(error, EC2Error))
         self.assertTrue(isinstance(error, Exception))
-        self.assertEquals(error.message, "timeout")
+        self.assertEquals(str(error), "timeout")
 
     def test_connection_error(self):
         failure = self.make_failure(type=ConnectionRefusedError)