public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-31 22:20:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Ripping out SNI/openssl/requests latest. Turns out pyOpenSSL barfs on a ton of pages."

Browse source 
This reverts commit 177b8aea09.
This commit is contained in:
Samuel Clay 2014-05-22 15:09:08 -07:00
parent 177b8aea09
commit 0db2a1d110
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/page_importer.py
View file

@ -50,7 +50,6 @@ class PageImporter(object):
's' if self.feed.num_subscribers != 1 else '', 's' if self.feed.num_subscribers != 1 else '',
self.feed.permalink, self.feed.permalink,
), ),
'Connection': 'close',
} }
@timelimit(15) @timelimit(15)
@ -79,6 +78,7 @@ class PageImporter(object):
else: else:
try: try:
response = requests.get(feed_link, headers=self.headers) response = requests.get(feed_link, headers=self.headers)
response.connection.close()
except requests.exceptions.TooManyRedirects: except requests.exceptions.TooManyRedirects:
response = requests.get(feed_link) response = requests.get(feed_link)
except (AttributeError, SocketError), e: except (AttributeError, SocketError), e:

5
config/requirements.txt
View file

@ -37,9 +37,12 @@ raven==3.1.17
readline==6.2.4.1 readline==6.2.4.1
redis==2.8.0 redis==2.8.0
hiredis==0.1.1 hiredis==0.1.1
requests==1.1.0 requests==2.2.1
seacucumber==1.5 seacucumber==1.5
South==0.7.6 South==0.7.6
stripe==1.12.2 stripe==1.12.2
django-oauth-toolkit==0.5.0 django-oauth-toolkit==0.5.0
django-cors-headers==0.12 django-cors-headers==0.12
pyOpenSSL==0.14
pyasn1==0.1.7
ndg-httpsclient==0.3.2