Commit 4623cc0

committed

v1.1.3

1 parent d64064b commit 4623cc0Copy full SHA for 4623cc0

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# urlsresolver v1.1.1`
	`1`	`+# urlsresolver v1.1.3`
`2`	`2`	`Python urls resolver library with meta refresh support.`
`3`	`3`
`4`	`4`	You can expand real address of any shortened url with `urlsresolver.resolve_url(url)` function.

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import re`
`6`	`6`	`from urlparse import urljoin`
`7`	`7`
`8`		`-__version__ = (1, 1, 2)`
	`8`	`+__version__ = (1, 1, 3)`
`9`	`9`	`__author__ = 'Alexandr Shurigin (https://github.com/phpdude/)'`
`10`	`10`
`11`	`11`	`# HTML tags syntax http://www.w3.org/TR/html-markup/syntax.html`
`@@ -64,6 +64,9 @@ def resolve_url(`
`64`	`64`	`s = requests.session()`
`65`	`65`
`66`	`66`	`urls_history = OrderedDict()`
	`67`	`+ # disable compression for streamed requests.`
	`68`	`+ s.headers['Accept-Encoding'] = ''`
	`69`	`+`
`67`	`70`	`if user_agent:`
`68`	`71`	`s.headers['User-Agent'] = user_agent`
`69`	`72`
`@@ -97,7 +100,13 @@ def follow_meta_redirects(url, max_redirects, **kwargs):`
`97`	`100`	`if redirect:`
`98`	`101`	`m = re.search('url\s=\s([^\s;]+)', redirect, re.I)`
`99`	`102`	`if m:`
`100`		`- real_url = follow_meta_redirects(urljoin(resp.url, m.group(1)), max_redirects)`
	`103`	`+ m = m.group(1)`
	`104`	`+`
	`105`	`+ # fixing case url='#url here#'`
	`106`	`+ if m.startswith(('"', "'")) and m.endswith(('"', "'")):`
	`107`	`+ m = m[1:-1]`
	`108`	`+`
	`109`	`+ real_url = follow_meta_redirects(urljoin(resp.url, m), max_redirects)`
`101`	`110`
`102`	`111`	`urls_history[real_url] = True`
`103`	`112`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`args.add_argument('-A', '--user-agent', help='Custom user agent')`
`14`	`14`	`args.add_argument('-S', '--chunk-size', default=1500, metavar='SIZE',`
`15`	`15`	`help='Length of fetched html block for testing meta redirects. Default 1500')`
`16`		`- args.add_argument('-H', '--history', help='Print redirection history', action='store_true')`
`17`	`16`	`args.add_argument(`
`18`	`17`	`'--remove_noscript',`
`19`	`18`	`action='store_true',`

Comments

(0)