Changeset 2731


Ignore:
Timestamp:
16/07/07 15:37:58 (12 years ago)
Author:
pjkersha
Message:

ndg.security.common/ndg/security/common/openssl.py:

  • fixed bug - removed ref to SimpleCAError
  • updated pydoc params
File:
1 edited

Legend:

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

    r2270 r2731  
    4848        read from 
    4949         
    50         @param filePath: path to OpenSSL configuration file""" 
     50        @type filePath: string         
     51        @keyword filePath: path to OpenSSL configuration file""" 
    5152         
    5253        SafeConfigParser.__init__(self) 
     
    5758        # Set-up CA directory 
    5859        if not os.environ.get('HOME'): 
    59             raise SimpleCAError, "Environment variable \"HOME\" is not set" 
     60            raise OpenSSLConfigError, 'Environment variable "HOME" is not set' 
    6061         
    6162        self.__caDir = os.path.join(os.environ['HOME'], self.__gridCASubDir) 
     
    6465    def __setFilePath(self, filePath): 
    6566        """Set property method 
     67        @type filePath: string 
    6668        @param filePath: path for OpenSSL configuration file""" 
    6769        if filePath is not None: 
     
    8587    def __getFilePath(self): 
    8688        """Get property method 
    87         @param filePath: file path for OpenSSL configuration file""" 
     89        @rtype: string 
     90        @return: file path for OpenSSL configuration file""" 
    8891        return self.__filePath 
    8992 
     
    9598    def __setCADir(self, caDir): 
    9699        """Set property method 
     100        @type caDir: string 
    97101        @param caDir: path for OpenSSL configuration file""" 
    98102        if filePath is not None: 
     
    115119    def __getCADir(self): 
    116120        """Get property method 
    117         @type caDir: string 
     121        @rtype caDir: string 
    118122        @return caDir: directory path for CA configuration files""" 
    119123        return self.__caDir 
     
    188192    def _filtOptVal(self, optVal): 
    189193        """For option value, filter out comments and substitute $dir with 
    190         the CA directory location""" 
     194        the CA directory location 
     195         
     196        @type optVal: string 
     197        @param optVal: option value""" 
    191198        return self.__class__._caDirPat.sub(self.__caDir, 
    192199                                            optVal.split('#')[0].strip()) 
     
    203210    def _setReqDN(self): 
    204211        """Set Required DN parameters from the configuration file returning 
    205         them in a dictionary 
    206          
    207         @return Distinguished Name OU and O defaults in a dictionary""" 
     212        them in a dictionary""" 
    208213         
    209214        # Nb. Match over line boundaries 
Note: See TracChangeset for help on using the changeset viewer.