Changeset 4671


Ignore:
Timestamp:
17/12/08 11:12:08 (11 years ago)
Author:
pjkersha
Message:

#941: added classifiers to MyProxyClient setup

Location:
TI12-security/trunk/python
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/MyProxyClient/setup.py

    r4642 r4671  
    3939    maintainer_email =          'Philip.Kershaw@stfc.ac.uk', 
    4040    url =                   'http://proj.badc.rl.ac.uk/ndg/wiki/Security', 
     41    platforms =              ['POSIX', 'Linux'], 
    4142    install_requires =      ['M2Crypto'], 
    4243    license =               __license__, 
     
    4647        'test': ['*.cfg', '*.conf', '*.crt', '*.key', 'README'] 
    4748    }, 
     49    classifiers=[ 
     50        'Development Status :: 4 - Beta', 
     51        'Environment :: Console', 
     52        'Environment :: Web Environment', 
     53        'Intended Audience :: End Users/Desktop', 
     54        'Intended Audience :: Developers', 
     55        'Intended Audience :: System Administrators', 
     56        'Intended Audience :: Science/Research', 
     57        'License :: <TODO> :: <TODO>', 
     58        'Natural Language :: English', 
     59        'Operating System :: Microsoft :: Windows', 
     60        'Operating System :: POSIX :: Linux', 
     61        'Programming Language :: Python', 
     62        'Topic :: Security', 
     63        'Topic :: Internet', 
     64        'Topic :: Scientific/Engineering', 
     65        'Topic :: System :: Distributed Computing', 
     66        'Topic :: System :: Systems Administration :: Authentication/Directory', 
     67    ], 
    4868    zip_safe = True 
    4969) 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/X509.py

    r4654 r4671  
    415415 
    416416    @classmethod 
    417     def Read(cls, filePath, **isValidTimeKw): 
     417    def Read(cls, filePath, warningStackLevel=4, **isValidTimeKw): 
    418418        """Create a new X509 certificate read in from a file""" 
    419419     
    420420        x509Cert = cls(filePath=filePath) 
    421421         
    422         if 'warningStackLevel' not in isValidTimeKw: 
    423             isValidTimeKw['warningStackLevel'] = 4 
    424              
    425         x509Cert.read(**isValidTimeKw) 
     422        x509Cert.read(warningStackLevel=warningStackLevel, **isValidTimeKw) 
    426423         
    427424        return x509Cert 
    428425     
    429426    @classmethod 
    430     def Parse(cls, x509CertTxt, **isValidTimeKw): 
     427    def Parse(cls, x509CertTxt, warningStackLevel=4, **isValidTimeKw): 
    431428        """Create a new X509 certificate from string of file content""" 
    432429     
    433430        x509Cert = cls() 
    434431         
    435         if 'warningStackLevel' not in isValidTimeKw: 
    436             isValidTimeKw['warningStackLevel'] = 4 
    437              
    438         x509Cert.parse(x509CertTxt, **isValidTimeKw) 
     432        x509Cert.parse(x509CertTxt,  
     433                       warningStackLevel=warningStackLevel, 
     434                       **isValidTimeKw) 
    439435         
    440436        return x509Cert 
    441437         
    442438# Alternative AttCert constructors 
    443 def X509CertRead(filePath, **isValidTimeKw): 
     439def X509CertRead(filePath, warningStackLevel=4, **isValidTimeKw): 
    444440    """Create a new X509 certificate read in from a file""" 
    445441 
    446     x509Cert = X509Cert(filePath=filePath) 
    447      
    448     if 'warningStackLevel' not in isValidTimeKw: 
    449         isValidTimeKw['warningStackLevel'] = 4 
    450          
    451     x509Cert.read(**isValidTimeKw) 
     442    x509Cert = X509Cert(filePath=filePath)     
     443    x509Cert.read(warningStackLevel=warningStackLevel, **isValidTimeKw) 
    452444     
    453445    return x509Cert 
    454446 
    455 def X509CertParse(x509CertTxt, **isValidTimeKw): 
     447def X509CertParse(x509CertTxt, warningStackLevel=4, **isValidTimeKw): 
    456448    """Create a new X509 certificate from string of file content""" 
    457449 
    458450    x509Cert = X509Cert() 
    459     if 'warningStackLevel' not in isValidTimeKw: 
    460         isValidTimeKw['warningStackLevel'] = 4 
    461              
    462     x509Cert.parse(x509CertTxt, **isValidTimeKw) 
     451    x509Cert.parse(x509CertTxt,  
     452                   warningStackLevel=warningStackLevel,  
     453                   **isValidTimeKw) 
    463454     
    464455    return x509Cert 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attributeauthorityclient/attAuthorityClientTest.cfg

    r4575 r4671  
    1111# ! SiteBMapConfig.xml trusted site A aaURI setting must agree with this  
    1212# setting for test6GetMappedAttCert 
    13 uri = http://localhost:5000/AttributeAuthority 
     13#uri = http://localhost:5000/AttributeAuthority 
    1414 
    1515# With TCP Mon: 
    16 #uri = http://localhost:4999/AttributeAuthority 
     16uri = http://localhost:4999/AttributeAuthority 
    1717 
    1818# For https connections only.  !Omit ssl* settings if using http! 
Note: See TracChangeset for help on using the changeset viewer.