@@ -338,7 +338,7 @@ def set(self, var, value):
338
338
"""
339
339
self ._lazy_init ()
340
340
globs = self ._regina_globals
341
- if type (value ) != str :
341
+ if not isinstance (value , str ) :
342
342
globs [var ] = value
343
343
return
344
344
try :
@@ -428,7 +428,7 @@ def _convert_args_kwds(self, *args, **kwds):
428
428
def convert_arg (arg ):
429
429
if isinstance (arg , InterfaceElement ) and arg .parent () is self :
430
430
return arg ._inst
431
- elif type (arg ) in (list , tuple ):
431
+ elif isinstance (arg , (list , tuple ) ):
432
432
return type (arg )([convert_arg (i ) for i in arg ])
433
433
elif hasattr (arg , '_regina_' ):
434
434
reg = arg ._regina_ (self )
@@ -832,9 +832,9 @@ def is_native(inst):
832
832
if operation in ('+' , '*' ):
833
833
if is_native (sinst ) and is_native (oinst ):
834
834
if operation == '*' :
835
- return P (sinst * oinst )
835
+ return P (sinst * oinst )
836
836
else :
837
- return P (sinst + oinst )
837
+ return P (sinst + oinst )
838
838
if type (sinst ) == type (oinst ):
839
839
if hasattr (self , 'addTermsLast' ):
840
840
new = self .__deepcopy__ ()
@@ -860,7 +860,7 @@ def is_native(inst):
860
860
return (~ self )** (- exp )
861
861
if operation == '1/' :
862
862
if is_native (sinst ):
863
- return P (1 / sinst )
863
+ return P (1 / sinst )
864
864
if hasattr (self , 'inverse' ):
865
865
return self .inverse ()
866
866
return super ()._operation (operation , other = other )
@@ -919,7 +919,6 @@ def from_detail_str(lc):
919
919
"""
920
920
if locals :
921
921
lc .update (locals )
922
- from sage .repl .preparse import implicit_mul
923
922
from sage .misc .sage_eval import sage_eval
924
923
s = self .detail ().split ('\n ' )[0 ]
925
924
s = s .replace (' ' , '' )
0 commit comments