Ignore:
Timestamp:
26/02/10 13:59:54 (10 years ago)
Author:
pjkersha
Message:

Fix to CSV file parsing re pattern.

Location:
TI12-security/branches/ndg-security-1.5.x
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/branches/ndg-security-1.5.x/.pydevproject

    r6637 r6644  
    55<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property> 
    66<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> 
     7<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 
     8<path>/ndg_security_1_5_x/ndg_security_server</path> 
     9<path>/ndg_security_1_5_x/ndg_security_common</path> 
     10<path>/ndg_security_1_5_x/ndg_security_client</path> 
     11<path>/ndg_security_1_5_x/ndg_security_test</path> 
     12</pydev_pathproperty> 
     13<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH"> 
     14<path>/home/pjkersha/workspace/ndg_security_saml_0_2_x</path> 
     15</pydev_pathproperty> 
    716</pydev_project> 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/ndg/security/server/attributeauthority.py

    r6067 r6644  
    117117    DEFAULT_PROPERTY_FILENAME = "attributeAuthority.cfg" 
    118118    ATTRIBUTE_INTERFACE_KEYNAME = 'attributeInterface' 
    119     CONFIG_LIST_SEP_PAT = re.compile(',\W*') 
     119    CONFIG_LIST_SEP_PAT = re.compile(',\s*') 
    120120     
    121121    attributeInterfacePropertyDefaults = { 
     
    16771677        self.attributeMap = {} 
    16781678        for line in lines: 
    1679             fields = re.split(',\W*', line.strip()) 
     1679            fields = re.split(',\s*', line.strip()) 
    16801680            self.attributeMap[fields[0]] = fields[1:] 
    16811681     
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/ndg/security/server/myproxy/certificate_extapp/saml_attribute_assertion.py

    r6068 r6644  
    201201        except AttributeError: 
    202202            # Coerce into setting AttributeQuerySslSOAPBinding attributes -  
    203             # names must start with 'attributeQuery\W' e.g. 
     203            # names must start with 'attributeQuery\s' e.g. 
    204204            # attributeQuery.clockSkew or attributeQuery_issuerDN 
    205205            if name.startswith(CertExtApp.ATTRIBUTE_QUERY_ATTRNAME):                 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/ndg/security/server/wsgi/__init__.py

    r6276 r6644  
    373373    propertyDefaults.update(NDGSecurityMiddlewareBase.propertyDefaults) 
    374374     
    375     CSV_PAT = re.compile(',\W*') 
     375    CSV_PAT = re.compile(',\s*') 
    376376     
    377377    # TODO: refactor to: 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/ndg/security/server/wsgi/authz/__init__.py

    r6512 r6644  
    501501 
    502502        # Coerce into setting AttributeQuerySslSOAPBinding attributes -  
    503         # names must start with 'attributeQuery\W' e.g. 
     503        # names must start with 'attributeQuery\s' e.g. 
    504504        # attributeQuery.clockSkew or attributeQuery_issuerDN 
    505505        if name.startswith(SamlPIPMiddleware.ATTRIBUTE_QUERY_ATTRNAME): 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_server/ndg/security/server/wsgi/openid/provider/axinterface/csv.py

    r6354 r6644  
    9191        nAttributes = len(self.attributeNames) 
    9292        for line in lines: 
    93             fields = re.split(',\W*', line.strip()) 
     93            fields = re.split(',\s*', line.strip()) 
    9494             
    9595            # Dictionary keyed by user ID with each val itself a dict keyed 
Note: See TracChangeset for help on using the changeset viewer.