@@ -265,22 +265,21 @@ assert_type(sparse.hstack([csc_arr, csc_arr], format="lil", dtype=np.complex64),
265265# block_array
266266assert_type (sparse .block_array ([[bsr_mat ]]), sparse .coo_matrix [ScalarType ])
267267assert_type (sparse .block_array ([[bsr_arr ]]), sparse .coo_array [ScalarType , tuple [int , int ]])
268- assert_type (sparse .block_array ([[csr_arr , None ], [None , dok_arr ]], format = "dia" ), sparse .dia_array [ScalarType ])
269268assert_type (sparse .block_array ([[coo_arr ]], dtype = int ), sparse .coo_array [np .int_ , tuple [int , int ]])
270269assert_type (sparse .block_array ([[csr_arr ]], dtype = sctype ), sparse .csr_array [ScalarType , tuple [int , int ]])
271270assert_type (sparse .block_array ([[lil_arr ]], dtype = np .complex64 ), sparse .coo_array [np .complex64 , tuple [int , int ]])
272271assert_type (sparse .block_array ([[csr_arr ]], format = "lil" ), sparse .lil_array [ScalarType ])
273- assert_type (sparse .block_array ([[coo_arr , None ]], format = "bsr" , dtype = "float" ), sparse .bsr_array [np .float64 ])
274- assert_type (sparse .block_array ([[dia_arr ], [ None ] ], format = "dok" , dtype = complex ), sparse .dok_array [np .complex128 ])
272+ assert_type (sparse .block_array ([[coo_arr ]], format = "bsr" , dtype = "float" ), sparse .bsr_array [np .float64 ])
273+ assert_type (sparse .block_array ([[dia_arr ]], format = "dok" , dtype = complex ), sparse .dok_array [np .complex128 ])
275274# bmat (legacy, `block_array` is p`referred)
276275assert_type (sparse .bmat ([[bsr_mat ]]), sparse .coo_matrix [ScalarType ])
277- assert_type (sparse .bmat ([[csr_mat ], [ None ] ]), sparse .csr_matrix [ScalarType ])
276+ assert_type (sparse .bmat ([[csr_mat ]]), sparse .csr_matrix [ScalarType ])
278277assert_type (sparse .bmat ([[dia_mat ]], dtype = np .int_ ), sparse .coo_matrix [np .int_ ])
279- assert_type (sparse .bmat ([[dok_mat ], [ None ] ], dtype = np .complex64 ), sparse .coo_matrix [np .complex64 ])
278+ assert_type (sparse .bmat ([[dok_mat ]], dtype = np .complex64 ), sparse .coo_matrix [np .complex64 ])
280279assert_type (sparse .bmat ([[bsr_arr ]]), sparse .coo_array [ScalarType , tuple [int , int ]])
281- assert_type (sparse .bmat ([[csr_arr ], [ None ] ]), sparse .csr_array [ScalarType , tuple [int , int ]])
280+ assert_type (sparse .bmat ([[csr_arr ]]), sparse .csr_array [ScalarType , tuple [int , int ]])
282281assert_type (sparse .bmat ([[dia_arr ]], dtype = np .int_ ), sparse .coo_array [np .int_ , tuple [int , int ]])
283- assert_type (sparse .bmat ([[dok_arr ], [ None ] ], dtype = np .complex64 ), sparse .coo_array [np .complex64 , tuple [int , int ]])
282+ assert_type (sparse .bmat ([[dok_arr ]], dtype = np .complex64 ), sparse .coo_array [np .complex64 , tuple [int , int ]])
284283
285284# block_diag
286285assert_type (sparse .block_diag ([any_arr , any_arr ]), sparse .coo_array [ScalarType , tuple [int , int ]])
0 commit comments