Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
ea36c941
Commit
ea36c941
authored
May 12, 2016
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses.
parent
9de7efe5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
56 additions
and
21 deletions
+56
-21
Lib/test/test_bool.py
Lib/test/test_bool.py
+4
-0
Lib/test/test_enum.py
Lib/test/test_enum.py
+12
-0
Lib/test/test_float.py
Lib/test/test_float.py
+18
-0
Lib/test/test_long.py
Lib/test/test_long.py
+17
-0
Misc/NEWS
Misc/NEWS
+2
-0
Objects/longobject.c
Objects/longobject.c
+3
-21
No files found.
Lib/test/test_bool.py
View file @
ea36c941
...
...
@@ -314,6 +314,10 @@ class BoolTest(unittest.TestCase):
return
-
1
self
.
assertRaises
(
ValueError
,
bool
,
Eggs
())
def
test_from_bytes
(
self
):
self
.
assertIs
(
bool
.
from_bytes
(
b'
\
x00
'
*
8
,
'big'
),
False
)
self
.
assertIs
(
bool
.
from_bytes
(
b'abcd'
,
'little'
),
True
)
def
test_sane_len
(
self
):
# this test just tests our assumptions about __len__
# this will start failing if __len__ changes assertions
...
...
Lib/test/test_enum.py
View file @
ea36c941
...
...
@@ -541,6 +541,18 @@ class TestEnum(unittest.TestCase):
self
.
assertEqual
([
k
for
k
,
v
in
WeekDay
.
__members__
.
items
()
if
v
.
name
!=
k
],
[
'TEUSDAY'
,
])
def
test_intenum_from_bytes
(
self
):
self
.
assertIs
(
IntStooges
.
from_bytes
(
b'
\
x00
\
x03
'
,
'big'
),
IntStooges
.
MOE
)
with
self
.
assertRaises
(
ValueError
):
IntStooges
.
from_bytes
(
b'
\
x00
\
x05
'
,
'big'
)
def
test_floatenum_fromhex
(
self
):
h
=
float
.
hex
(
FloatStooges
.
MOE
.
value
)
self
.
assertIs
(
FloatStooges
.
fromhex
(
h
),
FloatStooges
.
MOE
)
h
=
float
.
hex
(
FloatStooges
.
MOE
.
value
+
0.01
)
with
self
.
assertRaises
(
ValueError
):
FloatStooges
.
fromhex
(
h
)
def
test_pickle_enum
(
self
):
if
isinstance
(
Stooges
,
Exception
):
raise
Stooges
...
...
Lib/test/test_float.py
View file @
ea36c941
...
...
@@ -1355,6 +1355,24 @@ class HexFloatTestCase(unittest.TestCase):
else
:
self
.
identical
(
x
,
fromHex
(
toHex
(
x
)))
def
test_subclass
(
self
):
class
F
(
float
):
def
__new__
(
cls
,
value
):
return
float
.
__new__
(
cls
,
value
+
1
)
f
=
F
.
fromhex
((
1.5
).
hex
())
self
.
assertIs
(
type
(
f
),
F
)
self
.
assertEqual
(
f
,
2.5
)
class
F2
(
float
):
def
__init__
(
self
,
value
):
self
.
foo
=
'bar'
f
=
F2
.
fromhex
((
1.5
).
hex
())
self
.
assertIs
(
type
(
f
),
F2
)
self
.
assertEqual
(
f
,
1.5
)
self
.
assertEqual
(
getattr
(
f
,
'foo'
,
'none'
),
'bar'
)
if
__name__
==
'__main__'
:
unittest
.
main
()
Lib/test/test_long.py
View file @
ea36c941
...
...
@@ -1203,6 +1203,23 @@ class LongTest(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
myint
.
from_bytes
,
0
,
'big'
)
self
.
assertRaises
(
TypeError
,
int
.
from_bytes
,
0
,
'big'
,
True
)
class
myint2
(
int
):
def
__new__
(
cls
,
value
):
return
int
.
__new__
(
cls
,
value
+
1
)
i
=
myint2
.
from_bytes
(
b'
\
x01
'
,
'big'
)
self
.
assertIs
(
type
(
i
),
myint2
)
self
.
assertEqual
(
i
,
2
)
class
myint3
(
int
):
def
__init__
(
self
,
value
):
self
.
foo
=
'bar'
i
=
myint3
.
from_bytes
(
b'
\
x01
'
,
'big'
)
self
.
assertIs
(
type
(
i
),
myint3
)
self
.
assertEqual
(
i
,
1
)
self
.
assertEqual
(
getattr
(
i
,
'foo'
,
'none'
),
'bar'
)
def
test_access_to_nonexistent_digit_0
(
self
):
# http://bugs.python.org/issue14630: A bug in _PyLong_Copy meant that
# ob_digit[0] was being incorrectly accessed for instances of a
...
...
Misc/NEWS
View file @
ea36c941
...
...
@@ -10,6 +10,8 @@ Release date: tba
Core and Builtins
-----------------
- Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses.
- Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL
pointer.
...
...
Objects/longobject.c
View file @
ea36c941
...
...
@@ -5049,27 +5049,9 @@ long_from_bytes(PyTypeObject *type, PyObject *args, PyObject *kwds)
little_endian
,
is_signed
);
Py_DECREF
(
bytes
);
/* If from_bytes() was used on subclass, allocate new subclass
* instance, initialize it with decoded int value and return it.
*/
if
(
type
!=
&
PyLong_Type
&&
PyType_IsSubtype
(
type
,
&
PyLong_Type
))
{
PyLongObject
*
newobj
;
int
i
;
Py_ssize_t
n
=
Py_ABS
(
Py_SIZE
(
long_obj
));
newobj
=
(
PyLongObject
*
)
type
->
tp_alloc
(
type
,
n
);
if
(
newobj
==
NULL
)
{
Py_DECREF
(
long_obj
);
return
NULL
;
}
assert
(
PyLong_Check
(
newobj
));
Py_SIZE
(
newobj
)
=
Py_SIZE
(
long_obj
);
for
(
i
=
0
;
i
<
n
;
i
++
)
{
newobj
->
ob_digit
[
i
]
=
((
PyLongObject
*
)
long_obj
)
->
ob_digit
[
i
];
}
Py_DECREF
(
long_obj
);
return
(
PyObject
*
)
newobj
;
if
(
type
!=
&
PyLong_Type
)
{
Py_SETREF
(
long_obj
,
PyObject_CallFunctionObjArgs
((
PyObject
*
)
type
,
long_obj
,
NULL
));
}
return
long_obj
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment