0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

ox.web under_score api rewrite

Browse source
This commit is contained in:
j 2012-08-15 17:15:40 +02:00
commit a4fd3c930f
29 changed files with 268 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ox/web/siteparser.py
View file

@ -27,7 +27,7 @@ class SiteParser(dict):
baseUrl = ''
regex = {}
def getUrl(self, page):
def get_url(self, page):
return "%s%s" % (self.baseUrl, page)
def read_url(self, url, timeout):
@ -35,7 +35,7 @@ class SiteParser(dict):
def __init__(self, timeout=-1):
for key in self.regex:
url = self.getUrl(self.regex[key]['page'])
url = self.get_url(self.regex[key]['page'])
data = self.read_url(url, timeout)
if isinstance(self.regex[key]['re'], basestring):
data = re.compile(self.regex[key]['re'], re.DOTALL).findall(data)