mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #23048 from jfindlay/ET_error
py-2.6 compat for utils/boto.py ElementTree exception
This commit is contained in:
commit
d45aa21dca
1 changed files with 10 additions and 0 deletions
|
@ -61,6 +61,16 @@ else:
|
|||
callable = callable
|
||||
|
||||
|
||||
if not hasattr(ElementTree, 'ParseError'):
|
||||
class ParseError(Exception):
|
||||
'''
|
||||
older versions of ElementTree do not have ParseError
|
||||
'''
|
||||
pass
|
||||
|
||||
ElementTree.ParseError = ParseError
|
||||
|
||||
|
||||
def text_(s, encoding='latin-1', errors='strict'):
|
||||
'''
|
||||
If ``s`` is an instance of ``binary_type``, return
|
||||
|
|
Loading…
Add table
Reference in a new issue