Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

boto/ec2/elb/loadbalancer.py

 # Copyright (c) 2006-2009 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 149 matching lines @@
         return self.connection.create_load_balancer_listeners(self.name, listeners)
 
     def create_listener(self, inPort, outPort=None, proto="tcp"):
         if outPort == None:
             outPort = inPort
         return self.create_listeners([(inPort, outPort, proto)])
 
     def delete_listeners(self, listeners):
         return self.connection.delete_load_balancer_listeners(self.name, listeners)
 
-    def delete_listener(self, inPort, outPort=None, proto="tcp"):
-        if outPort == None:
-            outPort = inPort
-        return self.delete_listeners([(inPort, outPort, proto)])
+    def delete_listener(self, inPort):
+        return self.delete_listeners([inPort])
 
     def delete_policy(self, policy_name):
         """
         Deletes a policy from the LoadBalancer. The specified policy must not
         be enabled for any listeners.
         """
         return self.connection.delete_lb_policy(self.name, policy_name)
 
     def set_policies_of_listener(self, lb_port, policies):
         return self.connection.set_lb_policies_of_listener(self.name, lb_port, policies)
 
     def create_cookie_stickiness_policy(self, cookie_expiration_period, policy_name):
         return self.connection.create_lb_cookie_stickiness_policy(cookie_expiration_period, self.name, policy_name)
 
     def create_app_cookie_stickiness_policy(self, name, policy_name):
         return self.connection.create_app_cookie_stickiness_policy(name, self.name, policy_name)
 
     def set_listener_SSL_certificate(self, lb_port, ssl_certificate_id):
         return self.connection.set_lb_listener_SSL_certificate(self.name, lb_port, ssl_certificate_id)