d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2613 from DoumanAsh/btdigg_fix

Browse Source 
[search engine] Remove custom HTTPSConnection. Fix #2594
This commit is contained in:
sledgehammer999 2015-02-26 18:22:27 +02:00
commit 09d7c2777f
2 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/searchengine/nova/engines/btdigg.py
View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
#VERSION: 1.23 #VERSION: 1.24
#AUTHORS: BTDigg team (research@btdigg.org) #AUTHORS: BTDigg team (research@btdigg.org)
# #
# GNU GENERAL PUBLIC LICENSE # GNU GENERAL PUBLIC LICENSE
@ -24,36 +24,6 @@ import urllib
import urllib2 import urllib2
import sys 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 from novaprinter import prettyPrinter
class btdigg(object): class btdigg(object):
@ -88,9 +58,6 @@ class btdigg(object):
finally: finally:
u.close() u.close()
if __name__ == "__main__": if __name__ == "__main__":
s = btdigg() s = btdigg()
s.search(sys.argv[1]) s.search(sys.argv[1])

2
src/searchengine/nova/engines/versions.txt
View File

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