Skip to content

urllib2 headers changed #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rshiva wants to merge 14 commits into
base: master
Choose a base branch
from
Open

urllib2 headers changed #25

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0b2034c
printing jvm path to check
rshiva Jan 10, 2014
a2b1a4c
added request instead of urllib
rshiva Jun 5, 2014
57611cd
changed version number
rshiva Jun 12, 2014
3be575b
rollback version number
rshiva Jun 12, 2014
1298ef9
removed header causing 406
rshiva Aug 5, 2014
08aced4
removed tar gz breaking pip
rshiva Aug 6, 2014
e3bc692
changed the headers to mozilla
rshiva Aug 6, 2014
e426389
removed print statements
rshiva Aug 6, 2014
b9d5b3c
removed urllib2 and replaced with requests
rshiva Aug 20, 2014
fad21f6
user agent changed
rshiva Sep 24, 2014
b94b1c1
removed user-agent
rshiva Sep 24, 2014
f40bcba
user agent all
rshiva Sep 24, 2014
55ba133
undo
rshiva Sep 24, 2014
065397e
user agent to mozilla worked
rshiva Sep 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/boilerpipe/extract/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import jpype
import urllib2
import requests
import socket
import charade
import threading
Expand Down Expand Up @@ -28,17 +29,12 @@ class Extractor(object):
extractor = None
source = None
data = None
headers = {'User-Agent': 'Mozilla/5.0'}
headers = {'User-Agent': 'Mozilla'}

def __init__(self, extractor='DefaultExtractor', **kwargs):
if kwargs.get('url'):
request = urllib2.Request(kwargs['url'], headers=self.headers)
connection = urllib2.urlopen(request)
self.data = connection.read()
encoding = connection.headers['content-type'].lower().split('charset=')[-1]
if encoding.lower() == 'text/html':
encoding = charade.detect(self.data)['encoding']
self.data = unicode(self.data, encoding)
response = requests.request('GET', kwargs['url'], headers=self.headers)
self.data = response.text
elif kwargs.get('html'):
self.data = kwargs['html']
if not isinstance(self.data, unicode):
Expand Down