Changeset 4671 for TI12-security/trunk/python

Timestamp:

17/12/08 11:12:08 (12 years ago)

Author:

pjkersha

Message:

#941: added classifiers to MyProxyClient setup

Location:

TI12-security/trunk/python

Files:

• MyProxyClient/setup.py (modified) (2 diffs)
• ndg.security.common/ndg/security/common/X509.py (modified) (1 diff)
• ndg.security.test/ndg/security/test/attributeauthorityclient/attAuthorityClientTest.cfg (modified) (1 diff)

TI12-security/trunk/python/MyProxyClient/setup.py

@@ -39 +39 @@
     maintainer_email =          'Philip.Kershaw@stfc.ac.uk',
     url =                   'http://proj.badc.rl.ac.uk/ndg/wiki/Security',
+    platforms =              ['POSIX', 'Linux'],
     install_requires =      ['M2Crypto'],
     license =               __license__,
@@ -46 +47 @@
         'test': ['*.cfg', '*.conf', '*.crt', '*.key', 'README']
     },
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Environment :: Web Environment',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Developers',
+        'Intended Audience :: System Administrators',
+        'Intended Audience :: Science/Research',
+        'License :: <TODO> :: <TODO>',
+        'Natural Language :: English',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python',
+        'Topic :: Security',
+        'Topic :: Internet',
+        'Topic :: Scientific/Engineering',
+        'Topic :: System :: Distributed Computing',
+        'Topic :: System :: Systems Administration :: Authentication/Directory',
+    ],
     zip_safe = True
 )

TI12-security/trunk/python/ndg.security.common/ndg/security/common/X509.py

@@ -415 +415 @@
 
     @classmethod
-    def Read(cls, filePath, **isValidTimeKw):
+    def Read(cls, filePath, warningStackLevel=4, **isValidTimeKw):
         """Create a new X509 certificate read in from a file"""
     
         x509Cert = cls(filePath=filePath)
         
-        if 'warningStackLevel' not in isValidTimeKw:
-            isValidTimeKw['warningStackLevel'] = 4
-            
-        x509Cert.read(**isValidTimeKw)
+        x509Cert.read(warningStackLevel=warningStackLevel, **isValidTimeKw)
         
         return x509Cert
     
     @classmethod
-    def Parse(cls, x509CertTxt, **isValidTimeKw):
+    def Parse(cls, x509CertTxt, warningStackLevel=4, **isValidTimeKw):
         """Create a new X509 certificate from string of file content"""
     
         x509Cert = cls()
         
-        if 'warningStackLevel' not in isValidTimeKw:
-            isValidTimeKw['warningStackLevel'] = 4
-            
-        x509Cert.parse(x509CertTxt, **isValidTimeKw)
+        x509Cert.parse(x509CertTxt, 
+                       warningStackLevel=warningStackLevel,
+                       **isValidTimeKw)
         
         return x509Cert
         
 # Alternative AttCert constructors
-def X509CertRead(filePath, **isValidTimeKw):
+def X509CertRead(filePath, warningStackLevel=4, **isValidTimeKw):
     """Create a new X509 certificate read in from a file"""
 
-    x509Cert = X509Cert(filePath=filePath)
-    
-    if 'warningStackLevel' not in isValidTimeKw:
-        isValidTimeKw['warningStackLevel'] = 4
-        
-    x509Cert.read(**isValidTimeKw)
+    x509Cert = X509Cert(filePath=filePath)    
+    x509Cert.read(warningStackLevel=warningStackLevel, **isValidTimeKw)
     
     return x509Cert
 
-def X509CertParse(x509CertTxt, **isValidTimeKw):
+def X509CertParse(x509CertTxt, warningStackLevel=4, **isValidTimeKw):
     """Create a new X509 certificate from string of file content"""
 
     x509Cert = X509Cert()
-    if 'warningStackLevel' not in isValidTimeKw:
-        isValidTimeKw['warningStackLevel'] = 4
-            
-    x509Cert.parse(x509CertTxt, **isValidTimeKw)
+    x509Cert.parse(x509CertTxt, 
+                   warningStackLevel=warningStackLevel, 
+                   **isValidTimeKw)
     
     return x509Cert

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attributeauthorityclient/attAuthorityClientTest.cfg

@@ -11 +11 @@
 # ! SiteBMapConfig.xml trusted site A aaURI setting must agree with this 
 # setting for test6GetMappedAttCert
-uri = http://localhost:5000/AttributeAuthority
+#uri = http://localhost:5000/AttributeAuthority
 
 # With TCP Mon:
-#uri = http://localhost:4999/AttributeAuthority
+uri = http://localhost:4999/AttributeAuthority
 
 # For https connections only.  !Omit ssl* settings if using http!