1
=== modified file 'NEWS.rst'
2
--- NEWS.rst	2020-01-27 13:29:16 +0000
3
+++ NEWS.rst	2021-01-18 23:11:49 +0000
4
@@ -2,6 +2,11 @@
5
2
NEWS for lazr.restfulclient
2
NEWS for lazr.restfulclient
6
3
===========================
3
===========================
7
4
4
8
5
0.14.4
9
6
======
10
7
11
8
  - Drop support for Python < 2.6.
12
9
13
5
0.14.3 (2020-01-27)
10
0.14.3 (2020-01-27)
14
6
===================
11
===================
15
7
12
16
8
13
17
=== modified file 'src/lazr/restfulclient/_browser.py'
18
--- src/lazr/restfulclient/_browser.py	2018-11-17 13:16:44 +0000
19
+++ src/lazr/restfulclient/_browser.py	2021-01-18 23:11:49 +0000
20
@@ -33,6 +33,8 @@
21
33
import atexit
33
import atexit
22
34
import errno
34
import errno
23
35
from hashlib import md5
35
from hashlib import md5
24
36
from io import BytesIO
25
37
from json import dumps
26
36
import os
38
import os
27
37
import re
39
import re
28
38
import shutil
40
import shutil
29
@@ -50,17 +52,6 @@
30
50
except ImportError:
52
except ImportError:
31
51
    from httplib2 import ProxyInfo
53
    from httplib2 import ProxyInfo
32
52
    proxy_info_from_environment = ProxyInfo.from_environment
54
    proxy_info_from_environment = ProxyInfo.from_environment
33
53
try:
34
54
    # Python 3 and sufficiently modern Python 2 versions.
35
55
    from json import dumps
36
56
except ImportError:
37
57
    from simplejson import dumps
38
58
39
59
try:
40
60
    # Python 3.
41
61
    from io import BytesIO
42
62
except ImportError:
43
63
    from cStringIO import StringIO as BytesIO
44
64
55
45
65
try:
56
try:
46
66
    # Python 3.
57
    # Python 3.
47
67
58
48
=== modified file 'src/lazr/restfulclient/_json.py'
49
--- src/lazr/restfulclient/_json.py	2012-06-04 19:54:58 +0000
50
+++ src/lazr/restfulclient/_json.py	2021-01-18 23:11:49 +0000
51
@@ -22,12 +22,7 @@
52
22
__all__ = ['DatetimeJSONEncoder']
22
__all__ = ['DatetimeJSONEncoder']
53
23
23
54
24
import datetime
24
import datetime
61
25
25
from json import JSONEncoder
56
26
try:
57
27
    # Python 3 and sufficiently modern Python 2 versions.
58
28
    from json import JSONEncoder
59
29
except ImportError:
60
30
    from simplejson import JSONEncoder
62
31
26
63
32
27
64
33
class DatetimeJSONEncoder(JSONEncoder):
28
class DatetimeJSONEncoder(JSONEncoder):
65
34
29
66
=== modified file 'src/lazr/restfulclient/resource.py'
67
--- src/lazr/restfulclient/resource.py	2015-04-22 20:37:26 +0000
68
+++ src/lazr/restfulclient/resource.py	2021-01-18 23:11:49 +0000
69
@@ -29,22 +29,9 @@
70
29
    ]
29
    ]
71
30
30
72
31
31
89
32
try:
32
from email.message import Message
90
33
    from email.message import Message
33
from io import BytesIO
91
34
except ImportError:
34
from json import dumps, loads
76
35
    from email.Message import Message
77
36
78
37
try:
79
38
    # Python 3 and sufficiently modern Python 2 versions.
80
39
    from json import dumps, loads
81
40
except ImportError:
82
41
    from simplejson import dumps, loads
83
42
84
43
try:
85
44
    # Python 3.
86
45
    from io import BytesIO
87
46
except ImportError:
88
47
    from cStringIO import StringIO as BytesIO
92
48
35
93
49
try:
36
try:
94
50
    # Python 3.
37
    # Python 3.
Status:	Merged
Merged at revision:	174
Proposed branch:	lp:~cjwatson/lazr.restfulclient/no-py25
Merge into:	lp:lazr.restfulclient
Diff against target:	94 lines (+11/-33) 4 files modified NEWS.rst (+5/-0) src/lazr/restfulclient/_browser.py (+2/-11) src/lazr/restfulclient/_json.py (+1/-6) src/lazr/restfulclient/resource.py (+3/-16)
To merge this branch:	bzr merge lp:~cjwatson/lazr.restfulclient/no-py25
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Cristian Gonzalez (community)		2021-01-18	Approve on 2021-01-20
Review via email: mp+396457@code.launchpad.net
1	=== modified file 'NEWS.rst'
2	--- NEWS.rst 2020-01-27 13:29:16 +0000
3	+++ NEWS.rst 2021-01-18 23:11:49 +0000
4	@@ -2,6 +2,11 @@
5	2	NEWS for lazr.restfulclient	2	NEWS for lazr.restfulclient
6	3	===========================	3	===========================
7	4		4
8			5	0.14.4
9			6	======
10			7
11			8	- Drop support for Python < 2.6.
12			9
13	5	0.14.3 (2020-01-27)	10	0.14.3 (2020-01-27)
14	6	===================	11	===================
15	7		12
16	8		13
17	=== modified file 'src/lazr/restfulclient/_browser.py'
18	--- src/lazr/restfulclient/_browser.py 2018-11-17 13:16:44 +0000
19	+++ src/lazr/restfulclient/_browser.py 2021-01-18 23:11:49 +0000
20	@@ -33,6 +33,8 @@
21	33	import atexit	33	import atexit
22	34	import errno	34	import errno
23	35	from hashlib import md5	35	from hashlib import md5
24			36	from io import BytesIO
25			37	from json import dumps
26	36	import os	38	import os
27	37	import re	39	import re
28	38	import shutil	40	import shutil
29	@@ -50,17 +52,6 @@
30	50	except ImportError:	52	except ImportError:
31	51	from httplib2 import ProxyInfo	53	from httplib2 import ProxyInfo
32	52	proxy_info_from_environment = ProxyInfo.from_environment	54	proxy_info_from_environment = ProxyInfo.from_environment
33	53	try:
34	54	# Python 3 and sufficiently modern Python 2 versions.
35	55	from json import dumps
36	56	except ImportError:
37	57	from simplejson import dumps
38	58
39	59	try:
40	60	# Python 3.
41	61	from io import BytesIO
42	62	except ImportError:
43	63	from cStringIO import StringIO as BytesIO
44	64		55
45	65	try:	56	try:
46	66	# Python 3.	57	# Python 3.
47	67		58
48	=== modified file 'src/lazr/restfulclient/_json.py'
49	--- src/lazr/restfulclient/_json.py 2012-06-04 19:54:58 +0000
50	+++ src/lazr/restfulclient/_json.py 2021-01-18 23:11:49 +0000
51	@@ -22,12 +22,7 @@
52	22	__all__ = ['DatetimeJSONEncoder']	22	__all__ = ['DatetimeJSONEncoder']
53	23		23
54	24	import datetime	24	import datetime
61	25		25	from json import JSONEncoder
56	26	try:
57	27	# Python 3 and sufficiently modern Python 2 versions.
58	28	from json import JSONEncoder
59	29	except ImportError:
60	30	from simplejson import JSONEncoder
62	31		26
63	32		27
64	33	class DatetimeJSONEncoder(JSONEncoder):	28	class DatetimeJSONEncoder(JSONEncoder):
65	34		29
66	=== modified file 'src/lazr/restfulclient/resource.py'
67	--- src/lazr/restfulclient/resource.py 2015-04-22 20:37:26 +0000
68	+++ src/lazr/restfulclient/resource.py 2021-01-18 23:11:49 +0000
69	@@ -29,22 +29,9 @@
70	29	]	29	]
71	30		30
72	31		31
89	32	try:	32	from email.message import Message
90	33	from email.message import Message	33	from io import BytesIO
91	34	except ImportError:	34	from json import dumps, loads
76	35	from email.Message import Message
77	36
78	37	try:
79	38	# Python 3 and sufficiently modern Python 2 versions.
80	39	from json import dumps, loads
81	40	except ImportError:
82	41	from simplejson import dumps, loads
83	42
84	43	try:
85	44	# Python 3.
86	45	from io import BytesIO
87	46	except ImportError:
88	47	from cStringIO import StringIO as BytesIO
92	48		35
93	49	try:	36	try:
94	50	# Python 3.	37	# Python 3.