Changeset b931822

Timestamp:

Jul 7, 2012 10:25:21 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

2c36179

Parents:

bcc6fd6

Message:

Allow : in projects (grouper)

File:

• fedd/access_to_abac.py (modified) (4 diffs)

fedd/access_to_abac.py

@@ -21 +21 @@
     Encapculate a principal/attribute/link tuple.
     '''
-    bad_attr = re.compile('[^a-zA-Z0-9_]+')
+    bad_attr = re.compile('[^a-zA-Z0-9:_]+')
     def __init__(self, p, a, l=None):
         self.principal = p
@@ -42 +42 @@
     an intersection/conjunction.
     '''
-    bad_attr = re.compile('[^a-zA-Z0-9_]+')
+    bad_attr = re.compile('[^a-zA-Z0-9:_]+')
     def __init__(self, p, a, req):
         self.principal = p
@@ -217 +217 @@
             f.close()
             raise parse_error('Error on line %d of %s: %s' % \
-                    (i, fn, e.message))
+                    (i, fn, e))
     f.close()
 
@@ -330 +330 @@
 fedid_str = 'fedid:([0-9a-fA-F]{40})'
 id_str = '[a-zA-Z][\w_-]*'
-proj_str = '[a-zA-Z][\w_/-]*'
+proj_str = '[a-zA-Z][\w_:/-]*'
 path_str = '[a-zA-Z0-9_/\.-]+'
 id_any_str = '(%s|<any>)' % id_str