Subscription validator

MoinMoin/storage/middleware/validation.py

 # Copyright: 2011,2012 MoinMoin:ThomasWaldmann
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
 MoinMoin - validation for storage meta / data
 
 validation modes:
 
 trusted == False: for metadata coming from user input (like from web form) -
                   in this mode some values will be forced (e.g. mtime,
@@ skipping 311 matching lines @@
 def subscription_validator(element, state):
     """
     a subscription
     """
     try:
         keyword, value = element.value.split(":", 1)
     except ValueError:
         element.add_error("Subscription must contain colon delimiters.")
         return False
 
-    if keyword in (keys.ITEMID,):

[Thomas.J.Waldmann, 2013/07/16 16:19:26]

pep8 wants a blank after the comma

+    if keyword in (keys.ITEMID, ):
         value_element = String(value)
-        value_is_valid = uuid_validator(value_element, state)

[waldi, 2013/07/16 16:07:45]

I said: do that in a separate change.

[ana.balica, 2013/07/16 18:11:22]

What does mean then a separate change? New code review? Patch? Commit? Please be
more specific.

I have fixed it in a separate patch: #5 
https://codereview.appspot.com/11248043/diff2/8002:19001/MoinMoin/storage/mid...

-    elif keyword in (keys.NAME, keys.TAGS, keys.NAMERE, keys.NAMEPREFIX):

[Thomas.J.Waldmann, 2013/07/16 16:19:26]

here I'ld also like the trailing comma (and the blank after it)

[ana.balica, 2013/07/16 18:03:58]

Earlier I was suggested to change this
https://codereview.appspot.com/11248043/patch/19001/20002 to the no blanks, no
commas. 
We all need to agree on a single style.

+        valid = uuid_validator(value_element, state)
+    elif keyword in (keys.NAME, keys.TAGS, keys.NAMERE, keys.NAMEPREFIX, ):
         try:
             namespace, value = value.split(":", 1)
         except ValueError:
             element.add_error("Subscription must contain 2 colon delimiters.")
             return False
         namespace_element = String(namespace)
         if not namespace_validator(namespace_element, state):
             element.add_error("Not a valid namespace value.")
             return False
     else:
         element.add_error(
             "Subscription must start with one of the keywords: "
             "'itemid', 'name', 'tags', 'namere' or 'nameprefix'.")
         return False
 
     value_element = String(value)
     if keyword == keys.TAGS:
-        value_is_valid = tag_validator(value_element, state)

[Thomas.J.Waldmann, 2013/07/16 16:19:26]

maybe just "valid" instead "value_is_valid" is also pretty understandable.

+        valid = tag_validator(value_element, state)
     elif keyword == keys.NAME:
-        value_is_valid = name_validator(value_element, state)
+        valid = name_validator(value_element, state)
     elif keyword in (keys.NAMERE, keys.NAMEPREFIX):
-        value_is_valid = True
-    if not value_is_valid:
+        valid = True
+    if not valid:
         element.add_error("The value is not valid.")
-        return False
-    return True

[Thomas.J.Waldmann, 2013/07/16 16:19:26]

merge these 2 lines as "return valid" ?

+    return valid
 
 
 common_meta = (
     String.named(keys.ITEMID).validated_by(itemid_validator),
     String.named(keys.REVID).validated_by(revid_validator),
     String.named(keys.PARENTID).validated_by(uuid_validator).using(optional=True),
     String.named(keys.WIKINAME).using(strip=False).validated_by(wikiname_validator),
     String.named(keys.NAMESPACE).using(strip=False).validated_by(namespace_validator),
     List.named(keys.NAME).of(String.using(strip=False).validated_by(name_validator)).using(optional=True),
     List.named(keys.NAME_OLD).of(String.using(strip=False).validated_by(name_validator)).using(optional=True),
@@ skipping 60 matching lines @@
     coding = ct.parameters['charset'].lower()
     if coding not in ['ascii', 'utf-8', ]:
         return True  # checking 8bit encodings this way is pointless, decoding never raises
     text_bytes = data.read()
     data.seek(0)  # rewind, so it can be read again
     try:
         text_bytes.decode(coding)
         return True
     except UnicodeDecodeError:
         return False