Author: danielsh
Date: Mon Sep 24 14:22:53 2018
New Revision: 1841855

URL: http://svn.apache.org/viewvc?rev=1841855&view=rev
Log:
* tools/dist/security/parser.py
  (Notification.Metadata.__CULPRITS): Allow 'server' and 'client' to be
    specified in a tuple, to avoid a mixed-type API (compare str.__mod__()).

Modified:
    subversion/trunk/tools/dist/security/parser.py

Modified: subversion/trunk/tools/dist/security/parser.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/security/parser.py?rev=1841855&r1=1841854&r2=1841855&view=diff
==============================================================================
--- subversion/trunk/tools/dist/security/parser.py (original)
+++ subversion/trunk/tools/dist/security/parser.py Mon Sep 24 14:22:53 2018
@@ -50,9 +50,16 @@ class Notification(object):
         CULPRIT_SERVER = 'server'
         CULPRIT_CLIENT = 'client'
 
-        __CULPRITS = ((CULPRIT_SERVER, CULPRIT_CLIENT,
-                      (CULPRIT_SERVER, CULPRIT_CLIENT),
-                      (CULPRIT_CLIENT, CULPRIT_SERVER)))
+        # For compatibility, 'client' and 'server' may be specified either with
+        # or without a tuple.
+        __CULPRITS = (
+            CULPRIT_SERVER,
+            CULPRIT_CLIENT,
+            (CULPRIT_SERVER,)
+            (CULPRIT_CLIENT,)
+            (CULPRIT_SERVER, CULPRIT_CLIENT),
+            (CULPRIT_CLIENT, CULPRIT_SERVER),
+        )
 
         def __init__(self, basedir, tracking_id,
                      title, culprit, advisory, patches):


Reply via email to