Changeset 6669 for TI12-security


Ignore:
Timestamp:
03/03/10 15:43:06 (10 years ago)
Author:
pjkersha
Message:

Fixed ElementTree import.

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

Legend:

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

    r6644 r6669  
    33 
    44<pydev_project> 
    5 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property> 
     5<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property> 
    66<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> 
    77<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 
  • TI12-security/branches/ndg-security-1.5.x/ndg_security_common/ndg/security/common/authz/msi.py

    r6069 r6669  
    1616import traceback 
    1717import warnings 
    18 from elementtree import ElementTree 
     18try: 
     19    from xml.etree import ElementTree 
     20 
     21except ImportError: 
     22    warnings.warn("xml.etree not available, importing from elementtree egg " 
     23                  "instead") 
     24    from elementtree import ElementTree 
    1925 
    2026from ndg.security.common.utils import TypedList 
Note: See TracChangeset for help on using the changeset viewer.