Mercurial Repository: p/roundup/code: roundup/cgi/form

comparison roundup/cgi/form_parser.py @ 6939:38dc223d90cc

flake8 fixes - also change signature of parse() removed num_re from parse. Variable is not used in method. Nothing seems to call parse with the num_re. Also remove flake8 warning about running compile when defining argument to method.

author	John Rouillard <rouilj@ieee.org>
date	Thu, 08 Sep 2022 14:38:59 -0400
parents	408fd477761f
children

comparison

equal deleted inserted replaced

-:075d8c6626b0
+:38dc223d90cc
-import re, mimetypes
+import mimetypes
+import re
 from roundup import hyperdb, date, password
-from roundup.cgi import templating, TranslationService
+from roundup.cgi import TranslationService
 from roundup.cgi.exceptions import FormError
 class FormParser:
 # edit form variable handling (see unit tests)
 except AttributeError:
 _translator = TranslationService.get_translation()
 self._ = self.gettext = _translator.gettext
 self.ngettext = _translator.ngettext
-def parse(self, create=0, num_re=re.compile(r'^\d+$')):
+def parse(self, create=0):
 """ Item properties and their values are edited with html FORM
 variables and their values. You can:
 - Change the value of some property of the current item.
 - Create a new item of any class, and edit the new item's
 if d['link']:
 value = []
 for entry in self.extractFormList(form[key]):
 m = self.FV_DESIGNATOR.match(entry)
 if not m:
-raise FormError(self._('link "%(key)s" '
+raise FormError(self._(
+'link "%(key)s" '
 'value "%(entry)s" not a designator') % locals())
 value.append((m.group(1), m.group(2)))
 # get details of linked class
 lcn = m.group(1)
 got_props[(lcn, lnodeid)] = {}
 # make sure the link property is valid
 if (not isinstance(propdef[propname], hyperdb.Multilink) and
 not isinstance(propdef[propname], hyperdb.Link)):
-raise FormError(self._('%(class)s %(property)s '
+raise FormError(self._(
-'is not a link or multilink property') % {
+'%(class)s %(property)s '
-'class':cn, 'property':propname})
+'is not a link or multilink property') % {
+'class': cn, 'property': propname})
 all_links.append((cn, nodeid, propname, value))
 continue
 # detect the special ":required" variable
 if d['required']:
 for entry in self.extractFormList(form[key]):
 m = self.FV_SPECIAL.match(entry)
 if not m:
-raise FormError(self._('The form action claims to '
+raise FormError(self._(
+'The form action claims to '
 'require property "%(property)s" '
 'which doesn\'t exist') % {
-'property':propname})
+'property': propname})
 if m.group('classname'):
 this = (m.group('classname'), m.group('id'))
 entry = m.group('propname')
 if this not in all_required:
 all_required[this] = []
 mlaction = 'add'
 # does the property exist?
 if propname not in propdef:
 if mlaction != 'set':
-raise FormError(self._('You have submitted a %(action)s '
+raise FormError(self._(
+'You have submitted a %(action)s '
 'action for the property "%(property)s" '
 'which doesn\'t exist') % {
 'action': mlaction, 'property': propname})
 # the form element is probably just something we don't care
 # about - ignore it
 continue
 proptype = propdef[propname]
 elif isinstance(proptype, hyperdb.Multilink):
 value = self.extractFormList(value)
 else:
 # multiple values are not OK
 if isinstance(value, type([])):
-raise FormError(self._('You have submitted more than one '
+raise FormError(self._(
+'You have submitted more than one '
 'value for the %s property') % propname)
 # value might be a single file upload
 if not getattr(value, 'filename', None):
 value = value.value.strip()
 break
 else:
 raise FormError(self._('Password and confirmation text '
 'do not match'))
 if isinstance(confirm, type([])):
-raise FormError(self._('You have submitted more than one '
+raise FormError(self._(
+'You have submitted more than one '
 'value for the %s property') % propname)
 if value != confirm.value:
 raise FormError(self._('Password and confirmation text '
 'do not match'))
 try:
 value = None
 nodeid = None
 elif isinstance(proptype, hyperdb.Multilink):
 # convert input to list of ids
 try:
-l = hyperdb.rawToHyperdb(self.db, cl, nodeid,
+id_list = hyperdb.rawToHyperdb(self.db, cl, nodeid,
 propname, value)
 except hyperdb.HyperdbValueError as msg:
 raise FormError(msg)
 # now use that list of ids to modify the multilink
 if mlaction == 'set':
-value = l
+value = id_list
 else:
 # we're modifying the list - get the current list of ids
 if propname in props:
 existing = props[propname]
 elif nodeid and not nodeid.startswith('-'):
 # now either remove or add
 if mlaction == 'remove':
 # remove - handle situation where the id isn't in
 # the list
-for entry in l:
+for entry in id_list:
 try:
 existing.remove(entry)
 except ValueError:
-raise FormError(self._('property '
+raise FormError(self._(
+'property '
 '"%(propname)s": "%(value)s" '
 'not currently in list') % {
 'propname': propname, 'value': entry})
 else:
 # add - easy, just don't dupe
-for entry in l:
+for entry in id_list:
 if entry not in existing:
 existing.append(entry)
 value = existing
 # Sort the value in the same order used by
 # Multilink.from_raw.
 else:
 # handle all other types
 try:
 # Try handling file upload
 if (isinstance(proptype, hyperdb.String) and
 hasattr(value, 'filename') and
 value.filename is not None):
 value = self.parse_file(propdef, props, value)
 else:
 value = hyperdb.rawToHyperdb(self.db, cl, nodeid,
 propname, value)
 except hyperdb.HyperdbValueError as msg:
 if isinstance(proptype, hyperdb.String):
 # some backends store "missing" Strings as
 # empty strings
 if existing == self.db.BACKEND_MISSING_STRING:
 existing = None
-elif isinstance(proptype, hyperdb.Number) or \
+elif (isinstance(proptype, hyperdb.Number) or
-isinstance(proptype, hyperdb.Integer):
+isinstance(proptype, hyperdb.Integer)):
 # some backends store "missing" Numbers as 0 :(
 if existing == self.db.BACKEND_MISSING_NUMBER:
 existing = None
 elif isinstance(proptype, hyperdb.Boolean):
 # likewise Booleans

Mercurial > p > roundup > code

comparison roundup/cgi/form_parser.py @ 6939:38dc223d90cc