Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lmfdb/characters/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ def url_character(**kwargs):
return url_for('characters.render_characterNavigation')
elif kwargs['type'] == 'Dirichlet':
del kwargs['type']
if kwargs.get('calc',None):
if kwargs.get('calc'):
return url_for('characters.dc_calc',**kwargs)
else:
return url_for('characters.render_Dirichletwebpage',**kwargs)
elif kwargs['type'] == 'Hecke':
del kwargs['type']
if kwargs.get('calc',None):
if kwargs.get('calc'):
return url_for('characters.hc_calc',**kwargs)
else:
return url_for('characters.render_Heckewebpage',**kwargs)
18 changes: 9 additions & 9 deletions lmfdb/characters/web_character.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ def valuefield_from_order(order):
class WebCharObject():
""" class for all characters and character groups """
def __init__(self, **args):
self.type = args.get('type',None)
self.nflabel = args.get('number_field',None)
self.modlabel = args.get('modulus',None)
self.numlabel = args.get('number',None)
self.type = args.get('type')
self.nflabel = args.get('number_field')
self.modlabel = args.get('modulus')
self.numlabel = args.get('number')
self.args = args

self._compute()
Expand Down Expand Up @@ -558,14 +558,14 @@ class WebDBDirichlet(WebDirichlet):
"""
def __init__(self, **kwargs):
self.type = "Dirichlet"
self.modulus = kwargs.get('modulus', None)
self.modulus = kwargs.get('modulus')
if self.modulus:
self.modulus = int(self.modulus)
self.modlabel = self.modulus
if self.modulus == 1:
self.number = 1
else:
self.number = kwargs.get('number', None)
self.number = kwargs.get('number')
if self.number:
self.number = int(self.number)
self.numlabel = self.number
Expand Down Expand Up @@ -1108,11 +1108,11 @@ class WebDBDirichletOrbit(WebChar, WebDBDirichlet):
def __init__(self, **kwargs):
self.type = "Dirichlet"
self.isorbit = True
self.modulus = kwargs.get('modulus', None)
self.modulus = kwargs.get('modulus')
if self.modulus:
self.modulus = int(self.modulus)
self.modlabel = self.modulus
self.number = kwargs.get('number', None)
self.number = kwargs.get('number')
if self.number:
self.number = int(self.number)
self.numlabel = self.number
Expand All @@ -1122,7 +1122,7 @@ def __init__(self, **kwargs):
if self.number:
self.chi = ConreyCharacter(self.modulus, self.number)
self.codelangs = ('pari', 'sage')
self.orbit_label = kwargs.get('orbit_label', None) # this is what the user inserted, so might be banana
self.orbit_label = kwargs.get('orbit_label') # this is what the user inserted, so might be banana
self.label = "{}.{}".format(self.modulus, self.orbit_label)
self.maxrows = 30
self.rowtruncate = False
Expand Down
Loading