From d2c12683d3ddf454f99673ad7878673b60998b3e Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 10 Jan 2018 08:17:09 -0500 Subject: Fixes #4076 - simplify the implementation of int_from_bytes on python2 (#4077) * Fixes #4076 - simplify the implementation of int_from_bytes on python2 * whitespace * Added a test --- src/cryptography/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index d69ed89f..14909c66 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -57,8 +57,7 @@ else: assert byteorder == 'big' assert not signed - # call bytes() on data to allow the use of bytearrays - return int(bytes(data).encode('hex'), 16) + return int(binascii.hexlify(data), 16) if hasattr(int, "to_bytes"): -- cgit v1.2.3 enwrt/upstream
upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/dts/WMDR-143N.dts
blob: ccb1df3512305be37e5763d3f0bd1f237ed9cae1 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64