Merge branch 'develop'

ha-nyung · Aug 23, 2012 · 3265670 · 3265670
2 parents f19d562 + f8ea2bd
commit 3265670
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/apns.py b/apns.py
@@ -31,7 +31,7 @@
 try:
     from ssl import wrap_socket
 except ImportError:
-    from socket import ssl
+    from socket import ssl as wrap_socket
 
 try:
     import json
@@ -123,10 +123,7 @@ def _connect(self):
         # Establish an SSL connection
         self._socket = socket(AF_INET, SOCK_STREAM)
         self._socket.connect((self.server, self.port))
-        if wrap_socket:
-            self._ssl = wrap_socket(self._socket, self.key_file, self.cert_file)
-        else:
-            self._ssl = ssl(self._socket, self.key_file, self.cert_file)
+        self._ssl = wrap_socket(self._socket, self.key_file, self.cert_file)
 
     def _disconnect(self):
         if self._socket: