snappy 3.1.1__cp38-cp38-win_amd64.whl → 3.2__cp38-cp38-win_amd64.whl

snappy/settings.py

@@ -1,24 +1,31 @@
 import os
 import sys
-try:
-    import plistlib
-except ImportError:
-    from . import plistlib
+import plistlib
 from .gui import *
 from .app_menus import ListedWindow
+from .tkterminal import FontChoice, default_terminal_font
+
+def clip_font_size(size):
+    try:
+        value = int(size)
+    except:
+        return 13 if sys.platform == 'darwin' else 11
+    if value < 10:
+        return 10
+    if value > 36:
+        return 36
+    return size
 
 class Settings:
-    def __init__(self, text_widget):
-        self.text_widget = text_widget
+    def __init__(self):
         self.setting_dict = {
             'autocall' : False,
-            'automagic' : False,
-            'font' : self.current_font_tuple(),
+            'font' : self.default_font(),
             'cusp_horoballs' : True,
             'cusp_triangulation' : True,
             'cusp_ford_domain' : True,
             'cusp_parallelogram' : True,
-            'cusp_labels' : True,
+            'cusp_labels' : False,
             'cusp_cutoff' : '0.1000',
             'keyboard' : 'QWERTY'}
         self.cache = {}
@@ -41,14 +48,8 @@ class Settings:
     def get(self, key, default):
         return self.setting_dict.get(key, default)
 
-    def current_font_dict(self):
-        font_string = self.text_widget.cget('font')
-        return Font(font=font_string).actual()
-
-    def current_font_tuple(self):
-        font = self.current_font_dict()
-        style = '%s %s' % (font['weight'], font['slant'])
-        return (font['family'], font['size'], style)
+    def default_font(self):
+        return default_terminal_font()
 
     def find_settings(self):
         if sys.platform == 'darwin':
@@ -66,7 +67,7 @@ class Settings:
             self.setting_file = os.path.join(home, '.SnapPy.plist')
         else:
             self.setting_file = None
-
+        
     def read_settings(self):
         if self.setting_file:
             try:
@@ -75,18 +76,24 @@ class Settings:
                         self.setting_dict.update(plistlib.load(setting_file))
                 else:
                     self.setting_dict.update(plistlib.readPlist(self.setting_file))
-                # plistlib screws up tuples
-                self.setting_dict['font'] = tuple(self.setting_dict['font'])
-            except IOError:
+                family, size, info = self.setting_dict['font']
+                # Guard against crazy values in the settings plist file.
+                size = clip_font_size(size)
+                weight, slant = info.split()
+                self.setting_dict['font'] = FontChoice(family, size, weight, slant)
+            except OSError:
                 pass
 
     def write_settings(self):
         if self.setting_file:
+            setting_dict = self.setting_dict.copy()
+            font = self.setting_dict['font']
+            setting_dict['font'] = (font.family, font.size, font.rest)
             if hasattr(plistlib, 'dump'):
                 with open(self.setting_file, 'wb') as setting_file:
-                    plistlib.dump(self.setting_dict, setting_file)
+                    plistlib.dump(setting_dict, setting_file)
             else:
-                plistlib.writePlist(self.setting_dict, self.setting_file)
+                plistlib.writePlist(setting_dict, self.setting_file)
 
     def cache_settings(self):
         self.cache.update(self.setting_dict)
@@ -101,7 +108,6 @@ class Settings:
 
     # Override this in a subclass.
     def apply_settings(self):
-        self.text_widget.config(font=self.setting_dict['font'])
         print(self.setting_dict)
 
 
@@ -134,7 +140,7 @@ class SettingsDialog(Dialog):
 
     def run(self):
         self.wait_window(self)
-        
+
     def validate(self):
         cutoff = self.cutoff.get()
         try:
@@ -172,23 +178,15 @@ class SettingsDialog(Dialog):
                              sticky=Tk_.N + Tk_.S + Tk_.W + Tk_.E)
         self.body_frame.focus_set()
 
-    def build_font_pane(self, master):
-        current_font = self.settings.current_font_dict()
+    def build_font_pane(self, parent):
+        current_font = self.settings['font']
         groupBG = self.style.groupBG
-        self.font_frame = font_frame = ttk.Frame(master)
+        self.font_frame = font_frame = ttk.Frame(parent)
         font_frame.columnconfigure(2, weight=1)
         font_frame.columnconfigure(0, weight=1)
         self.list_frame = list_frame = ttk.Frame(font_frame)
         self.font_list = font_list = Tk_.Listbox(list_frame,
                                                  selectmode=Tk_.SINGLE)
-        self.families = families = [f for f in font_families()
-                                    if f[0] != '@'] # omit vertical fonts
-        families.sort()
-        for family in families:
-            font_list.insert(Tk_.END, family)
-        self.current_family = families.index(current_font['family'])
-        font_list.selection_set(self.current_family)
-        font_list.see(self.current_family)
         font_list.grid(row=0, column=0, pady=(20,30))
         font_scroller = ttk.Scrollbar(list_frame,
                                       command=font_list.yview)
@@ -199,17 +197,31 @@ class SettingsDialog(Dialog):
         label = ttk.Label(self.font_frame, text='Size: ')
         label.grid(row=0, column=1, sticky=Tk_.E, pady=(20,0))
         self.font_sizer = sizer = Spinbox(font_frame, from_=10, to_=36, width=4,
-                                             command=self.set_font_sample,
-                                             )
+                                          command=self.set_font_sample)
+        def check_font_size(size):
+            try:
+                value = int(size)
+            except:
+                sizer.set(13 if sys.platform == 'darwin' else 11)
+                return False
+            if value < 10:
+                sizer.set(10)
+                return False
+            if value > 36:
+                sizer.set(36)
+                return False
+            return True
+        validator = parent.register(check_font_size)
+        sizer.config(validate ="key", validatecommand =(validator, '%P'))
         sizer.delete(0,2)
-        sizer.insert(0, current_font['size'] )
+        sizer.insert(0, clip_font_size(current_font.size))
         sizer.bind('<Return>', self.set_font_sample)
         sizer.bind('<Tab>', self.set_font_sample)
-        self.current_size = current_font['size']
+        self.current_size = current_font.size
         sizer.grid(row=0, column=2, sticky=Tk_.W, pady=(20,0))
         label = ttk.Label(font_frame, text='Weight: ')
         label.grid(row=1, column=1, sticky=Tk_.E)
-        self.font_weight = weight = Tk_.StringVar(value=current_font['weight'])
+        self.font_weight = weight = Tk_.StringVar(value=current_font.weight)
         radio = ttk.Radiobutton(font_frame, text='normal', variable=weight,
                                     value='normal', command=self.set_font_sample)
         radio.grid(row=1, column=2, sticky=Tk_.W)
@@ -218,25 +230,47 @@ class SettingsDialog(Dialog):
         radio.grid(row=2, column=2, sticky=Tk_.W)
         label = ttk.Label(font_frame, text='Slant: ')
         label.grid(row=3, column=1, sticky=Tk_.E)
-        self.font_slant = slant = Tk_.StringVar(value=current_font['slant'])
+        self.font_slant = slant = Tk_.StringVar(value=current_font.slant)
         radio = ttk.Radiobutton(font_frame, text='roman', variable=slant,
                                  value='roman', command=self.set_font_sample)
         radio.grid(row=3, column=2, sticky=Tk_.W)
         radio = ttk.Radiobutton(font_frame, text='italic', variable=slant,
                                     value='italic', command=self.set_font_sample)
         radio.grid(row=4, column=2, sticky=Tk_.W)
-        self.sample = sample = Tk_.Text(self.font_frame,
+
+        self.fixed_only =  Tk_.BooleanVar(value=True)
+        self.check_fixed = ttk.Checkbutton(font_frame, variable=self.fixed_only,
+                                           text='Fixed-width fonts only',
+                                           command=self.set_font_families)
+        self.check_fixed.grid(row=6, column=0, pady=(0, 10), sticky=Tk_.N)
+        self.sample = sample = Tk_.Text(font_frame,
                                         width=40, height=6,
                                         highlightthickness=0,
                                         relief=Tk_.FLAT,
-                                        font=self.settings['font'])
+                                        font=self.settings['font'].as_tuple())
         self.sample.bind('<Button-1>', lambda event: 'break')
         self.sample.insert(Tk_.INSERT, '\nABCDEFGHIJKLMNOPQRSTUVWXYZ\n'
                            'abcdefghijklmnopqrstuvwxyz')
         sample.tag_add('all', '1.0', Tk_.END)
-        self.set_font_sample()
         font_list.bind('<ButtonRelease-1>', self.set_font_sample)
-        self.sample.grid(row=6, columnspan=4, padx=10, pady=10, sticky=Tk_.E+Tk_.W)
+        self.sample.grid(row=7, columnspan=4, padx=10, pady=10, sticky=Tk_.E+Tk_.W)
+        self.set_font_families()
+        self.set_font_sample()
+
+    def set_font_families(self):
+        families = {f for f in font_families()
+                    if f[0] != '@' and f.lower().find('emoji') < 0} # omit vertical fonts, emojis
+        if self.fixed_only.get():
+            families = {f for f in families if Font(family=f).metrics('fixed')}
+        families.add(self.settings['font'].family)
+        self.families = families = sorted(families)
+        if self.font_list.size() > 0:
+            self.font_list.delete(0, self.font_list.size() - 1)
+        for family in families:
+            self.font_list.insert(Tk_.END, family)
+        self.current_family = families.index(self.settings['font'].family)
+        self.font_list.selection_set(self.current_family)
+        self.font_list.see(self.current_family)
 
     def get_font(self):
         selection = self.font_list.curselection()
@@ -253,21 +287,20 @@ class SettingsDialog(Dialog):
             self.font_sizer.delete(0, Tk_.END)
             self.font_sizer.insert(0, str(size))
         self.font_list.selection_set(self.current_family)
-        style = '%s %s' % (self.font_weight.get(), self.font_slant.get())
-        return (family, size, style.strip())
+        return FontChoice(family, size,
+                          self.font_weight.get(), self.font_slant.get())
 
     def set_font_sample(self, event=None):
         new_font = self.get_font()
         self.settings['font'] = new_font
         self.sample.tag_config('all', justify=Tk_.CENTER,
-                               font=new_font)
+                               font=new_font.as_tuple())
 
-    def build_shell_pane(self, master):
+    def build_shell_pane(self, parent):
         groupBG = self.style.groupBG
         self.autocall = Tk_.BooleanVar(value=self.settings['autocall'])
-        self.automagic = Tk_.BooleanVar(value=self.settings['automagic'])
         self.update_idletasks()
-        self.shell_frame = shell_frame = ttk.Frame(master)
+        self.shell_frame = shell_frame = ttk.Frame(parent)
         shell_frame.rowconfigure(3, weight=1)
         shell_frame.columnconfigure(0, weight=1)
         shell_frame.columnconfigure(3, weight=1)
@@ -281,20 +314,14 @@ class SettingsDialog(Dialog):
                                     text='IPython autocall',
                                     command=self.set_autocall)
         next_check.grid(row=1, column=1, sticky=Tk_.W, pady=(10,0))
-        next_check = ttk.Checkbutton(shell_frame, variable=self.automagic,
-                                    text='IPython automagic',
-                                    command=self.set_automagic)
         next_check.grid(row=2, column=1, sticky=Tk_.W, pady=(5,0))
 
     def set_autocall(self):
         self.settings['autocall'] = self.autocall.get()
 
-    def set_automagic(self):
-        self.settings['automagic'] = self.automagic.get()
-
-    def build_cusp_pane(self, master):
+    def build_cusp_pane(self, parent):
         groupBG = self.style.groupBG
-        self.cusp_frame = cusp_frame = ttk.Frame(master)
+        self.cusp_frame = cusp_frame = ttk.Frame(parent)
         self.horoballs = Tk_.BooleanVar(value=self.settings['cusp_horoballs'])
         self.triangulation = Tk_.BooleanVar(value=self.settings['cusp_triangulation'])
         self.ford = Tk_.BooleanVar(value=self.settings['cusp_ford_domain'])
@@ -353,10 +380,10 @@ class SettingsDialog(Dialog):
     def set_parallelogram(self):
         self.settings['cusp_parallelogram'] = self.parallelogram.get()
 
-    def build_inside_pane(self, master):
+    def build_inside_pane(self, parent):
         groupBG = self.style.groupBG
         self.keyboard = Tk_.Variable(value=self.settings['keyboard'])
-        self.inside_frame = frame = ttk.Frame(master)
+        self.inside_frame = frame = ttk.Frame(parent)
         frame.rowconfigure(3, weight=1)
         frame.columnconfigure(0, weight=1)
         frame.columnconfigure(3, weight=1)
@@ -376,21 +403,7 @@ class SettingsDialog(Dialog):
 
 if __name__ == '__main__':
     parent = Tk_.Tk(className='snappy')
-    text_widget = Tk_.Text(parent)
-    text_widget.insert(Tk_.INSERT, """
-Lorem ipsum dolor sit amet, consectetur adipisicing
-elit, sed do eiusmod tempor incididunt ut labore et
-dolore magna aliqua. Ut enim ad minim veniam, quis
-nostrud exercitation ullamco laboris nisi ut aliquip
-ex ea commodo consequat. Duis aute irure dolor in
-reprehenderit in voluptate velit esse cillum dolore
-eu fugiat nulla pariatur. Excepteur sint occaecat
-cupidatat non proident, sunt in culpa qui officia
-deserunt mollit anim id est laborum.""")
-    text_widget.tag_add('all', '1.0', Tk_.END)
-    text_widget.tag_config('all', lmargin1=20, lmargin2=20)
-    text_widget.pack()
-    settings = Settings(text_widget)
+    settings = Settings()
     settings.apply_settings()
     SettingsDialog(parent, settings)
     parent.mainloop()

snappy/shell.py

@@ -40,6 +40,8 @@ class SnapPyInteractiveShellEmbed(InteractiveShellEmbed):
     colors_force = True
     separate_out = '\n'
     separate_in = ''
+    show_rewritten_input = False
+    pt_app = None
 
     def __init__(self, *args, **kwargs):
         super(InteractiveShellEmbed, self).__init__(*args, **kwargs)

snappy/snap/character_varieties.py

@@ -359,7 +359,7 @@ def character_variety_ideal(gens, rels=None):
     2
     """
     presentation = character_variety(gens, rels)
-    from sage.all import PolynomialRing, QQ
+    from ..sage_helper import PolynomialRing, QQ
     R = PolynomialRing(QQ, [repr(v) for v in presentation.gens])
     return R.ideal([R(p) for p in presentation.rels])
 
@@ -369,7 +369,7 @@ def total_answer_length(I):
 
 
 if __name__ == "__main__":
-    from snappy.sage_helper import _within_sage, doctest_modules
+    from snappy.testing import doctest_modules
     import sys
     current_module = sys.modules[__name__]
     doctest_modules([current_module])

snappy/snap/find_field.py

@@ -1,8 +1,9 @@
-from sage.all import (cached_method, real_part, imag_part, round, ceil, floor, log,
-                      ZZ, QQ, CDF, ComplexField, NumberField, PolynomialRing,
-                      matrix, identity_matrix)
 import itertools
 
+from ..sage_helper import (cached_method, real_part, imag_part, round, ceil, floor, log,
+                           ZZ, QQ, CDF, ComplexField, NumberField, PolynomialRing,
+                           matrix, identity_matrix)
+
 
 def error(poly, z, a=ZZ(0)):
     """

snappy/snap/fundamental_polyhedron.py

@@ -11,7 +11,7 @@ __all__ = ['FundamentalPolyhedronEngine']
 
 from ..sage_helper import _within_sage
 if _within_sage:
-    from sage.all import matrix
+    from ..sage_helper import matrix
 else:
     from .utilities import Matrix2x2 as matrix
 
@@ -342,7 +342,7 @@ class FundamentalPolyhedronEngine(McomplexEngine):
 
         The GeneratorMatrices computed here are for the face-pairing
         presentation with respect to the fundamental polyhedron.
-        That presentation can be simplfied by M.fundamental_group(...)
+        That presentation can be simplified by M.fundamental_group(...)
         and this function will compute the matrices for the simplified
         presentation from the GeneratorMatrices.
 

snappy/snap/kernel_structures.py

@@ -17,7 +17,7 @@ def _clean_ideal_vertices(vertices):
 
 class TransferKernelStructuresEngine(McomplexEngine):
     def __init__(self, mcomplex, snappyTriangulation):
-        super(TransferKernelStructuresEngine, self).__init__(mcomplex)
+        super().__init__(mcomplex)
         self.snappyTriangulation = snappyTriangulation
 
     def add_shapes(self, shapes):
@@ -122,3 +122,7 @@ class TransferKernelStructuresEngine(McomplexEngine):
     def reindex_cusps_and_transfer_peripheral_curves(self):
         self.reindex_cusps_and_add_peripheral_curves(
             self.snappyTriangulation._get_cusp_indices_and_peripheral_curve_data())
+
+        for cusp, cusp_info in zip(self.mcomplex.Vertices,
+                                   self.snappyTriangulation.cusp_info()):
+            cusp.is_complete = cusp_info['complete?']

snappy/snap/nsagetools.py

@@ -5,11 +5,9 @@ import string
 from ..sage_helper import _within_sage, sage_method
 
 if _within_sage:
-    import sage
-    from sage.all import (ZZ, vector, matrix, block_matrix, identity_matrix,
-                          gcd, prod, det, MatrixSpace, AbelianGroup, GroupAlgebra,
-                          SageObject, PolynomialRing, LaurentPolynomialRing)
-
+    from ..sage_helper import ZZ, vector, matrix, block_matrix, identity_matrix, gcd, prod, det
+    from ..sage_helper import MatrixSpace, PolynomialRing, LaurentPolynomialRing
+    from ..sage_helper import SageObject, AbelianGroup, GroupAlgebra
     from .polished_reps import polished_holonomy, MatrixRepresentation
     Id2 = MatrixSpace(ZZ, 2)(1)
 else:
@@ -332,13 +330,14 @@ def alexander_polynomial(manifold, **kwargs):
         sage: N.alexander_polynomial()
         a^2*b + a*b^2 + a*b + a + b
 
-    Any provided keyword arguments are passed to fundamental_group and
+    Any provided keyword arguments are passed to
+    :meth:`fundamental_group <snappy.Triangulation.fundamental_group>` and
     so affect the group presentation used in the computation.
     """
     if manifold.homology().order() != 'infinite':
         raise ValueError(
             "Alexander polynomial only defined for manifolds with "
-            "infinite fundamental group")
+            "infinite homology.")
 
     ans = alexander_polynomial_group(manifold.fundamental_group(**kwargs))
     coeffs = ans.coefficients()
@@ -474,8 +473,10 @@ def fast_determinant_of_laurent_poly_matrix(A):
     polynomial entries.
     """
     R = A.base_ring()
-    minexp = minimum_exponents(A.list())
     P = R.polynomial_ring()
+    if A == 0:
+        return P(0)
+    minexp = minimum_exponents(A.list())
     MS = A.parent().change_ring(P)
     Ap = MS([convert_laurent_to_poly(p, minexp, P) for p in A.list()])
     return Ap.det()

snappy/snap/peripheral/dual_cellulation.py

@@ -6,7 +6,8 @@ from ... import sage_helper
 from .. import t3mlite as t3m
 
 if sage_helper._within_sage:
-    from sage.all import (ZZ, matrix, vector, ChainComplex, Graph)
+    from ...sage_helper import ZZ, matrix, vector, ChainComplex
+    from sage.graphs.graph import Graph
 
 
 class DualCell():
@@ -57,7 +58,7 @@ class DualCellulation():
     """
     def __init__(self, triangulation):
         self.dual_triangulation = triangulation
-        self.from_original = dict()
+        self.from_original = {}
         self.vertices = []
         self.edges = []
         self.faces = []
@@ -179,7 +180,7 @@ class OneCycle():
         G = Graph(multiedges=True)
         for edge in D.edges:
             if self.weights[edge.index] != 0:
-                i, j = [v.index for v in edge.vertices]
+                i, j = (v.index for v in edge.vertices)
                 G.add_edge(i, j, edge.index)
 
         assert G.num_verts() == G.num_edges()

snappy/snap/peripheral/peripheral.py

@@ -3,7 +3,7 @@ from .. import t3mlite as t3m
 from . import link, dual_cellulation
 
 if sage_helper._within_sage:
-    from sage.all import matrix, vector, ZZ
+    from ...sage_helper import matrix, vector, ZZ
 
 
 def peripheral_curve_from_snappy(dual_cell, snappy_data):
@@ -105,7 +105,7 @@ class PeripheralOneCocycle():
         tet = self.mcomplex.Tetrahedra[tet_num]
         triangle = tet.CuspCorners[V]
         for side in triangle.oriented_sides():
-            E0, E1 = [link.TruncatedSimplexCorners[V][v] for v in side.vertices]
+            E0, E1 = (link.TruncatedSimplexCorners[V][v] for v in side.vertices)
             if E0 | E1 == F:
                 break
         assert E0 | E1 == F

snappy/snap/peripheral/surface.py

@@ -2,8 +2,8 @@ from collections import OrderedDict
 from ... import sage_helper
 
 if sage_helper._within_sage:
-    from sage.all import (ZZ, matrix, vector, ChainComplex,
-                          cached_method, line, arrow, text)
+    from ...sage_helper import ZZ, matrix, vector, cached_method, ChainComplex
+    from sage.plot.all import line, arrow, text
 else:
     def cached_method(func):
         return func
@@ -50,7 +50,7 @@ class Edge():
         self.index = None
 
     def glued_to(self, side):
-        for sides in ( [S for S in self.sides], [-S for S in self.sides] ):
+        for sides in ( list(self.sides), [-S for S in self.sides] ):
             if side in sides:
                 sides.remove(side)
                 return sides[0]
@@ -83,7 +83,7 @@ class EdgeList():
     vertex.
     """
     def __init__(self, items):
-        self.data = dict()
+        self.data = {}
         for i, x in enumerate(items):
             self[i] = x
 
@@ -237,7 +237,7 @@ class Surface():
             vertices.append(V)
 
         self.vertices = vertices
-        self._vertex_containing_corner = dict([( (C.triangle, C.vertex), V) for V in vertices for C in V.corners])
+        self._vertex_containing_corner = {(C.triangle, C.vertex): V for V in vertices for C in V.corners}
 
     def build(self):
         """

snappy/snap/peripheral/test.py

@@ -19,7 +19,7 @@ def verbose():
 def doctest_globals(module):
     if hasattr(module, 'doctest_globals'):
         return module.doctest_globals()
-    return dict()
+    return {}
 
 
 if __name__ == '__main__':

snappy/snap/polished_reps.py

@@ -10,10 +10,10 @@ from ..pari import pari
 from .fundamental_polyhedron import *
 
 if _within_sage:
-    import sage
-    from sage.all import RealField, ComplexField, gcd, prod, powerset
-    from sage.all import MatrixSpace, matrix, vector, ZZ
-    Object = sage.structure.sage_object.SageObject
+    from ..sage_helper import RealField, ComplexField, gcd, prod, powerset
+    from ..sage_helper import MatrixSpace, matrix, vector, ZZ
+    from ..sage_helper import SageObject as Object
+
     identity = lambda A: MatrixSpace(A.base_ring(), A.nrows())(1)
     abelian_group_elt = lambda v: vector(ZZ, v)
 else:
@@ -256,9 +256,9 @@ class ManifoldGroup(MatrixRepresentation):
           -0.49024466750661447990098220731 + 2.9794470664789769463726817144*I
 
         """
-        M, L = [self.SL2C(w) for w in self.peripheral_curves()[cusp_num]]
+        M, L = (self.SL2C(w) for w in self.peripheral_curves()[cusp_num])
         C = extend_to_basis(parabolic_eigenvector(M))
-        M, L = [ make_trace_2( C**(-1)*A*C ) for A in [M, L] ]
+        M, L = ( make_trace_2( C**(-1)*A*C ) for A in [M, L] )
         z = L[0][1]/M[0][1]
         return z.conjugate()
 
@@ -303,8 +303,8 @@ def polished_holonomy(manifold,
                       dec_prec=None,
                       match_kernel=True):
     """
-    Return the fundamental group of M equipt with a high-precision version of the
-    holonomy representation::
+    Return the fundamental group of M equipped with a high-precision version of
+    the holonomy representation::
 
         sage: M = Manifold('m004')
         sage: G = M.polished_holonomy()