Trivial refactoring

This commit is contained in:
Miroslav Stampar 2016-03-01 14:48:53 +01:00
parent 05fa7eb7c6
commit 1b5a4651a9
2 changed files with 3 additions and 5 deletions

View File

@ -20,7 +20,7 @@ from lib.core.enums import OS
from lib.core.revision import getRevisionNumber from lib.core.revision import getRevisionNumber
# sqlmap version and site # sqlmap version and site
VERSION = "1.0.0.9" VERSION = "1.0.0.10"
REVISION = getRevisionNumber() REVISION = getRevisionNumber()
STABLE = VERSION.count('.') <= 2 STABLE = VERSION.count('.') <= 2
VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev") VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")

View File

@ -16,14 +16,12 @@ import sys
import urllib import urllib
import urllib2 import urllib2
TIMEOUT = 10 def get_pagerank(url, timeout=10):
def get_pagerank(url):
url = url.encode('utf8') if isinstance(url, unicode) else url url = url.encode('utf8') if isinstance(url, unicode) else url
_ = 'http://toolbarqueries.google.com/tbr?client=navclient-auto&features=Rank&ch=%s&q=info:%s' % (check_hash(hash_url(url)), urllib.quote(url)) _ = 'http://toolbarqueries.google.com/tbr?client=navclient-auto&features=Rank&ch=%s&q=info:%s' % (check_hash(hash_url(url)), urllib.quote(url))
try: try:
req = urllib2.Request(_) req = urllib2.Request(_)
rank = urllib2.urlopen(req, timeout=TIMEOUT).read().strip()[9:] rank = urllib2.urlopen(req, timeout=timeout).read().strip()[9:]
except: except:
rank = 'N/A' rank = 'N/A'
else: else: