Ignore:
Timestamp:
29/10/08 11:49:44 (11 years ago)
Author:
pjkersha
Message:

Rerun Credential Wallet and AA client unittests with refactored WSDL stubs in place.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/credentialwallet.py

    r4379 r4392  
    2424 
    2525# Access Attribute Authority's web service using ZSI - allow pass if not  
    26 # loaded since it's possible to make AttAuthority instance locally without  
     26# loaded since it's possible to make AttributeAuthority instance locally without  
    2727# using the WS 
    2828aaImportError = True 
    2929try: 
    30     # AttAuthority client package resides with CredentialWallet module in  
     30    # AttributeAuthority client package resides with CredentialWallet module in  
    3131    # ndg.security.common 
    32     from ndg.security.common.attributeauthority import AttributeAuthorityClient, \ 
    33         AttributeAuthorityClientError, AttributeRequestDenied, \ 
    34         NoMatchingRoleInTrustedHosts 
     32    from ndg.security.common.attributeauthority import \ 
     33        AttributeAuthorityClient, AttributeAuthorityClientError, \ 
     34        AttributeRequestDenied, NoMatchingRoleInTrustedHosts 
    3535    aaImportError = False 
    3636except ImportError: 
     
    3838    pass 
    3939 
    40 # Likewise - may not want to use WS and use AttributeAuthority locally in which case 
    41 # no need to import it 
     40# Likewise - may not want to use WS and use AttributeAuthority locally in which 
     41# case no need to import it 
    4242try: 
    4343    from ndg.security.server.attributeauthority import AttributeAuthority, \ 
     
    4545    aaImportError = False 
    4646except: 
    47     log.warning('Loading CredentialWallet without Attribute Authority interface ' 
    48                 'imports') 
     47    log.warning('Loading CredentialWallet without Attribute Authority ' 
     48                'interface imports') 
    4949    pass 
    5050 
    5151if aaImportError: 
    52     raise ImportError("Either AttributeAuthority or AttributeAuthorityClient classes must " 
    53                       "be present to allow interoperation with Attribute " 
    54                       "Authorities") 
     52    raise ImportError("Either AttributeAuthority or AttributeAuthorityClient " 
     53                      "classes must be present to allow interoperation with " 
     54                      "Attribute Authorities") 
    5555 
    5656# Authentication X.509 Certificate 
     
    6868 
    6969class _CredentialWalletException(Exception):     
    70     """Generic Exception class for CredentialWallet module.  Overrides Exception to  
    71     enable writing to the log""" 
     70    """Generic Exception class for CredentialWallet module.  Overrides  
     71    Exception to enable writing to the log""" 
    7272    def __init__(self, msg): 
    7373        log.error(msg) 
     
    156156 
    157157 
    158 # CredentialWallet is a 'new-style' class inheriting from "object" and making use 
    159 # of new Get/Set methods for hiding of attributes 
     158# CredentialWallet is a 'new-style' class inheriting from "object" and making  
     159# use of new Get/Set methods for hiding of attributes 
    160160class CredentialWallet(object): 
    161161    """Volatile store of user credentials associated with a user session 
     
    329329        from 
    330330        @type cfgPrefix: basestring 
    331         @param cfgPrefix: apply a prefix to all CredentialWallet config params so  
    332         that if placed in a file with other parameters they can be  
     331        @param cfgPrefix: apply a prefix to all CredentialWallet config params  
     332        so that if placed in a file with other parameters they can be  
    333333        distinguished 
    334334        @type cfgKw: dict 
Note: See TracChangeset for help on using the changeset viewer.