svn commit: r1693504 - /subversion/trunk/tools/dist/security/parser.py

[br...@apache.org]

Author: brane
Date: Thu Jul 30 21:17:27 2015
New Revision: 1693504

URL: http://svn.apache.org/r1693504
Log:
Simplify culprit accusation for security notifications.

* tools/dist/security/parser.py
  (Notification.CULPRIT_BOTH): Remove.
  (Notification.__culprits): Change to tuple and list all possible values.
  (Notification.__init__):
   - Construct a better error message listing possible culprits.
   - Make self.culprit a set to simplify member checks.

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=1693504&r1=1693503&r2=1693504&view=diff
==============================================================================
--- subversion/trunk/tools/dist/security/parser.py (original)
+++ subversion/trunk/tools/dist/security/parser.py Thu Jul 30 21:17:27 2015
@@ -48,18 +48,19 @@ class Notification(object):
 
         CULPRIT_SERVER = 'server'
         CULPRIT_CLIENT = 'client'
-        CULPRIT_BOTH = 'both'
 
-        __culprits = frozenset((CULPRIT_SERVER, CULPRIT_CLIENT, CULPRIT_BOTH))
+        __culprits = ((CULPRIT_SERVER, CULPRIT_CLIENT,
+                      (CULPRIT_SERVER, CULPRIT_CLIENT),
+                      (CULPRIT_CLIENT, CULPRIT_SERVER)))
 
         def __init__(self, basedir, tracking_id,
                      title, culprit, advisory, patches):
             if culprit not in self.__culprits:
                 raise ValueError('Culprit should be one of: '
-                                 + ', '.join(self.__culprits))
+                                 + ', '.join(repr(x) for x in self.__culprits))
             self.tracking_id = tracking_id
             self.title = title
-            self.culprit = culprit
+            self.culprit = frozenset(tuple(culprit))
             self.advisory = Advisory(os.path.join(basedir, advisory))
             self.patches = []
             for base_version, patchfile in patches.items():