Mercurial > p > roundup > code
annotate roundup/anypy/urllib_.py @ 5402:88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
The existing roundup/anypy/urllib_.py is extended to cover more
imports and used in more places. Manual patch.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Tue, 24 Jul 2018 23:48:30 +0000 |
| parents | 894aa07be6cb |
| children | 7b194e35d332 |
| rev | line source |
|---|---|
|
4362
74476eaac38a
more modernisation
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1 |
|
74476eaac38a
more modernisation
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2 try: |
|
4996
dfd0bcc947e5
Add comments about supported anypy python versions
John Kristensen <john@jerrykan.com>
parents:
4362
diff
changeset
|
3 # Python 3+ |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5121
diff
changeset
|
4 from urllib.parse import quote, unquote, urlencode, urlparse, parse_qs, \ |
|
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5121
diff
changeset
|
5 urlunparse |
|
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5121
diff
changeset
|
6 from urllib.request import urlopen |
|
4362
74476eaac38a
more modernisation
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
7 except: |
|
4996
dfd0bcc947e5
Add comments about supported anypy python versions
John Kristensen <john@jerrykan.com>
parents:
4362
diff
changeset
|
8 # Python 2.5-2.7 |
|
5402
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5121
diff
changeset
|
9 from urllib import quote, unquote, urlencode |
|
88dbacd11cd1
Python 3 preparation: update urllib / urllib2 / urlparse imports.
Joseph Myers <jsm@polyomino.org.uk>
parents:
5121
diff
changeset
|
10 from urllib2 import urlopen |
|
5121
894aa07be6cb
issue2550785: Using login from search (or logout) fails. when
John Rouillard <rouilj@ieee.org>
parents:
4996
diff
changeset
|
11 from urlparse import urlparse, parse_qs, urlunparse |