1111# - array type only supports old buffer interface
1212# - array.frombytes is not available, must use deprecated array.fromstring
1313if sys .version_info [0 ] < 3 :
14- def __memoryview (obj ):
14+ def make_memoryview (obj ):
1515 return memoryview (buffer (obj ))
1616
17- def __make_array (f , data ):
17+ def make_array (f , data ):
1818 a = array (f )
1919 a .fromstring (data )
2020 return a
2121
22- def __get_data (a ):
22+ def get_data (a ):
2323 return a .tostring ()
2424else :
25- __memoryview = memoryview
25+ make_memoryview = memoryview
2626
27- def __make_array (f , data ):
27+ def make_array (f , data ):
2828 a = array (f )
2929 a .frombytes (data )
3030 return a
3131
32- def __get_data (a ):
32+ def get_data (a ):
3333 return a .tobytes ()
3434
3535
3636def __run_test (format , nbytes , expected_header , expected_prefix , use_bin_type ):
3737 # create a new array
3838 original_array = array (format )
3939 original_array .fromlist ([255 ] * (nbytes // original_array .itemsize ))
40- original_data = __get_data (original_array )
41- view = __memoryview (original_array )
40+ original_data = get_data (original_array )
41+ view = make_memoryview (original_array )
4242
4343 # pack, unpack, and reconstruct array
4444 packed = packb (view , use_bin_type = use_bin_type )
4545 unpacked = unpackb (packed )
46- reconstructed_array = __make_array (format , unpacked )
46+ reconstructed_array = make_array (format , unpacked )
4747
4848 # check that we got the right amount of data
4949 assert len (original_data ) == nbytes
@@ -57,79 +57,49 @@ def __run_test(format, nbytes, expected_header, expected_prefix, use_bin_type):
5757 assert original_array == reconstructed_array
5858
5959
60- # -----------
61- # test fixstr
62- # -----------
63-
64-
65- def test_memoryview_byte_fixstr ():
60+ def test_fixstr_from_byte ():
6661 __run_test ('B' , 31 , b'\xbf ' , b'' , False )
6762
6863
69- def test_memoryview_float_fixstr ():
64+ def test_fixstr_from_float ():
7065 __run_test ('f' , 28 , b'\xbc ' , b'' , False )
7166
7267
73- # ----------
74- # test str16
75- # ----------
76-
77-
78- def test_memoryview_byte_str16 ():
68+ def test_str16_from_byte ():
7969 __run_test ('B' , 2 ** 8 , b'\xda ' , b'\x01 \x00 ' , False )
8070
8171
82- def test_memoryview_float_str16 ():
72+ def test_str16_from_float ():
8373 __run_test ('f' , 2 ** 8 , b'\xda ' , b'\x01 \x00 ' , False )
8474
8575
86- # ----------
87- # test str32
88- # ----------
89-
90-
91- def test_memoryview_byte_str32 ():
76+ def test_str32_from_byte ():
9277 __run_test ('B' , 2 ** 16 , b'\xdb ' , b'\x00 \x01 \x00 \x00 ' , False )
9378
9479
95- def test_memoryview_float_str32 ():
80+ def test_str32_from_float ():
9681 __run_test ('f' , 2 ** 16 , b'\xdb ' , b'\x00 \x01 \x00 \x00 ' , False )
9782
9883
99- # ---------
100- # test bin8
101- # ---------
102-
103-
104- def test_memoryview_byte_bin8 ():
84+ def test_bin8_from_byte ():
10585 __run_test ('B' , 1 , b'\xc4 ' , b'\x01 ' , True )
10686
10787
108- def test_memoryview_float_bin8 ():
88+ def test_bin8_from_float ():
10989 __run_test ('f' , 4 , b'\xc4 ' , b'\x04 ' , True )
11090
11191
112- # ----------
113- # test bin16
114- # ----------
115-
116-
117- def test_memoryview_byte_bin16 ():
92+ def test_bin16_from_byte ():
11893 __run_test ('B' , 2 ** 8 , b'\xc5 ' , b'\x01 \x00 ' , True )
11994
12095
121- def test_memoryview_float_bin16 ():
96+ def test_bin16_from_float ():
12297 __run_test ('f' , 2 ** 8 , b'\xc5 ' , b'\x01 \x00 ' , True )
12398
12499
125- # ----------
126- # test bin32
127- # ----------
128-
129-
130- def test_memoryview_byte_bin32 ():
100+ def test_bin32_from_byte ():
131101 __run_test ('B' , 2 ** 16 , b'\xc6 ' , b'\x00 \x01 \x00 \x00 ' , True )
132102
133103
134- def test_memoryview_float_bin32 ():
104+ def test_bin32_from_float ():
135105 __run_test ('f' , 2 ** 16 , b'\xc6 ' , b'\x00 \x01 \x00 \x00 ' , True )
0 commit comments