Merge pull request #2613 from DoumanAsh/btdigg_fix

[search engine] Remove custom HTTPSConnection. Fix #2594

src/searchengine/nova/engines/btdigg.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 
-#VERSION: 1.23
+#VERSION: 1.24
 #AUTHORS: BTDigg team (research@btdigg.org)
 #
 #                    GNU GENERAL PUBLIC LICENSE
@@ -24,47 +24,17 @@ import urllib
 import urllib2
 import sys
 
-if sys.platform == 'win32':
-    import httplib
-    import socket
-    import ssl
-
-    class HTTPSConnection(httplib.HTTPConnection):
-        "This class allows communication via SSL."
-
-        default_port = httplib.HTTPS_PORT
-
-        def __init__(self, host, port=None, key_file=None, cert_file=None,
-                     strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-                     source_address=None):
-            httplib.HTTPConnection.__init__(self, host, port, strict, timeout,
-                                    source_address)
-            self.key_file = key_file
-            self.cert_file = cert_file
-
-        def connect(self):
-            "Connect to a host on a given (SSL) port."
-
-            sock = socket.create_connection((self.host, self.port),
-                                            self.timeout, self.source_address)
-            if self._tunnel_host:
-                self.sock = sock
-                self._tunnel()
-            self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file, ssl_version=ssl.PROTOCOL_TLSv1)
-
-    httplib.HTTPSConnection =  HTTPSConnection
-
 from novaprinter import prettyPrinter
 
 class btdigg(object):
     url = 'https://btdigg.org'
-    name = 'BTDigg' 
+    name = 'BTDigg'
 
     supported_categories = {'all': ''}
-	
+
     def __init__(self):
         pass
-        
+
     def search(self, what, cat='all'):
         req = urllib.unquote(what)
         u = urllib2.urlopen('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.urlencode(dict(q = req)),))
@@ -87,9 +57,6 @@ class btdigg(object):
                 prettyPrinter(res)
         finally:
             u.close()
-        
-
-      
 
 if __name__ == "__main__":
     s = btdigg()

src/searchengine/nova/engines/versions.txt

@@ -3,5 +3,5 @@ mininova: 1.51
 piratebay: 2.10
 extratorrent: 1.2
 kickasstorrents: 1.26
-btdigg: 1.23
+btdigg: 1.24
 legittorrents: 1.02