Skip to content

Commit e3b6119

Browse files
committed
Edit unpickling.pyx imports
1 parent d06d283 commit e3b6119

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/sage/matroids/unpickling.pyx

+7-10
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,19 @@ AUTHORS:
2626
# ****************************************************************************
2727

2828
from sage.data_structures.bitset_base cimport *
29-
import sage.matroids.matroid
30-
import sage.matroids.basis_exchange_matroid
29+
from sage.libs.gmp.mpq cimport mpq_set
30+
from sage.rings.rational cimport Rational
31+
3132
from sage.matroids.basis_matroid cimport BasisMatroid
32-
from sage.matroids.circuit_closures_matroid cimport CircuitClosuresMatroid
3333
from sage.matroids.circuits_matroid cimport CircuitsMatroid
34+
from sage.matroids.circuit_closures_matroid cimport CircuitClosuresMatroid
3435
from sage.matroids.dual_matroid import DualMatroid
35-
from sage.matroids.lean_matrix cimport GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix, PlusMinusOneMatrix, RationalMatrix
3636
from sage.matroids.graphic_matroid import GraphicMatroid
37+
from sage.matroids.lean_matrix cimport GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix, PlusMinusOneMatrix, RationalMatrix
3738
from sage.matroids.linear_matroid cimport LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid
3839
from sage.matroids.minor_matroid import MinorMatroid
3940

4041

41-
from sage.rings.rational cimport Rational
42-
from sage.libs.gmp.mpq cimport mpq_set
43-
44-
4542
#############################################################################
4643
# BasisMatroid
4744
#############################################################################
@@ -403,11 +400,11 @@ def unpickle_rational_matrix(version, data):
403400
mpq_set(A._entries[i], (<Rational?> data[2][i]).value)
404401
return A
405402

403+
406404
#############################################################################
407405
# LinearMatroid and subclasses
408406
#############################################################################
409407

410-
411408
def unpickle_linear_matroid(version, data):
412409
"""
413410
Unpickle a LinearMatroid.
@@ -688,11 +685,11 @@ def unpickle_minor_matroid(version, data):
688685
M.rename(data[3])
689686
return M
690687

688+
691689
#############################################################################
692690
# Graphic Matroids
693691
#############################################################################
694692

695-
696693
def unpickle_graphic_matroid(version, data):
697694
"""
698695
Unpickle a GraphicMatroid.

0 commit comments

Comments
 (0)