New attempt at defusedxml

ewsterrenburg · Aug 21, 2017 · f156c89 · f156c89
1 parent 97018c5
commit f156c89
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/otrs/client.py b/otrs/client.py
@@ -1,7 +1,7 @@
 """OTRS :: client."""
 import abc
 import codecs
-import defusedxml.ElementTree as etree
+from defusedxml import ElementTree as etree
 try:
  import http.client as httplib
  import urllib.request as urllib2
@@ -11,16 +11,23 @@
 from otrs.objects import extract_tagname
 from otrs.objects import OTRSObject
 from posixpath import join as urljoin
-from otrs.objects import OTRSObject, extract_tagname
 import sys
-import xml.etree.ElementTree as etree
+# defusedxml doesn't define these non-parsing related objects
+from xml.etree.ElementTree import Element
+from xml.etree.ElementTree import SubElement
+from xml.etree.ElementTree import tostring
+
+etree.Element = _ElementType = Element
+etree.SubElement = SubElement
+etree.tostring = tostring
 
 # Fix Python 2.x.
 try:
  UNICODE_EXISTS = bool(type(unicode))
 except NameError:
  unicode = lambda s: str(s)
 
+
 class OTRSError(Exception):
  """Base class for OTRS Errors."""
 

diff --git a/otrs/objects.py b/otrs/objects.py
@@ -1,16 +1,25 @@
 """OTRS :: objects."""
 from __future__ import unicode_literals
 import base64
+from defusedxml import ElementTree as etree
 import os
 import sys
-import xml.etree.ElementTree as etree
+# defusedxml doesn't define these non-parsing related objects
+from xml.etree.ElementTree import Element
+from xml.etree.ElementTree import SubElement
+from xml.etree.ElementTree import tostring
 
-# Fix Python 2.x.
+etree.Element = _ElementType = Element
+etree.SubElement = SubElement
+etree.tostring = tostring
+
+# Fix Python 3.x.
 try:
  UNICODE_EXISTS = bool(type(unicode))
 except NameError:
  unicode = lambda s: str(s)
 
+
 class OTRSObject(object):
  """Represents an object for OTRS (mappable to an XML element)."""
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
  name='python-otrs',
- version='0.4.2',
+ version='0.4.3',
  description='A programmatic interface to OTRS SOAP API.',
  long_description=README,
  author='Erwin Sterrenburg',
@@ -18,7 +18,9 @@
  license='GPLv3',
  zip_safe=False,
  packages=find_packages(),
+ install_requires=['defusedxml'],
  include_package_data=True,
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
  keywords='otrs ticket support soap interface helpdesk',
  classifiers=[
  # How mature is this project? Common values are