thanks Łukasz Rekucki (lqc) for more fixes

Author: Dmitry V Selitsky

setup.py

@@ -7,7 +7,7 @@
 import sys
 from distutils.core import setup
 
-required = ['pycrypto', 'tlslite']
+required = ['pycrypto', 'tlslite', 'lxml']
 
 if sys.version_info[:3] < (2, 9, 0):
     raise NotImplemented('Python 3.5+ required, bye-bye')

src/atom/__init__.py

@@ -34,16 +34,7 @@
 
 # __author__ = 'api.jscudder (Jeffrey Scudder)'
 
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    try:
-        import cElementTree as ElementTree
-    except ImportError:
-        try:
-            from xml.etree import ElementTree
-        except ImportError:
-            from elementtree import ElementTree
+import lxml.etree as ElementTree
 import warnings
 
 # XML namespaces which are often used in Atom entities.
@@ -334,7 +325,7 @@ def _BecomeChildElement(self, tree):
         not be called on instances of AtomBase.
 
         """
-        new_child = ElementTree.Element('')
+        new_child = ElementTree.Element('tag__')
         tree.append(new_child)
         new_child.tag = '{%s}%s' % (self.__class__._namespace,
                                     self.__class__._tag)
@@ -353,7 +344,7 @@ def _ToElementTree(self):
         self._AddMembersToElementTree(new_tree)
         return new_tree
 
-    def ToString(self, string_encoding='UTF-8'):
+    def ToString(self, string_encoding=str):
         """Converts the Atom object to a string containing XML."""
         return ElementTree.tostring(self._ToElementTree(), encoding=string_encoding)
 
@@ -1350,7 +1341,7 @@ def __init__(self, tag, namespace=None, attributes=None,
         self.text = text
 
     def ToString(self):
-        element_tree = self._TransferToElementTree(ElementTree.Element(''))
+        element_tree = self._TransferToElementTree(ElementTree.Element('tag__'))
         return ElementTree.tostring(element_tree, encoding="UTF-8")
 
     def _TransferToElementTree(self, element_tree):
@@ -1382,7 +1373,7 @@ def _BecomeChildElement(self, element_tree):
           element_tree: ElementTree._Element The element to which this object's XML
               will be added.
         """
-        new_element = ElementTree.Element('')
+        new_element = ElementTree.Element('tag__')  # uh, uhm... empty tag name - sorry google, this is bogus? (c)https://github.com/lqc
         element_tree.append(new_element)
         self._TransferToElementTree(new_element)
 

src/atom/core.py

@@ -22,16 +22,7 @@
 
 import inspect
 
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    try:
-        import cElementTree as ElementTree
-    except ImportError:
-        try:
-            from xml.etree import ElementTree
-        except ImportError:
-            from elementtree import ElementTree
+import lxml.etree as ElementTree
 
 try:
     from xml.dom.minidom import parseString as xmlString
@@ -295,12 +286,12 @@ def _harvest_tree(self, tree, version=1):
         if tree.text:
             self.text = tree.text
 
-    def _to_tree(self, version=1, encoding=None):
+    def _to_tree(self, version=1):
         new_tree = ElementTree.Element(_get_qname(self, version))
-        self._attach_members(new_tree, version, encoding)
+        self._attach_members(new_tree, version)
         return new_tree
 
-    def _attach_members(self, tree, version=1, encoding=None):
+    def _attach_members(self, tree, version=1):
         """Convert members to XML elements/attributes and add them to the tree.
 
         Args:
@@ -314,7 +305,7 @@ def _attach_members(self, tree, version=1, encoding=None):
           encoding: str (optional)
         """
         qname, elements, attributes = self.__class__._get_rules(version)
-        encoding = encoding or STRING_ENCODING
+        encoding = STRING_ENCODING
         # Add the expected elements and attributes to the tree.
         if elements:
             for tag, element_def in elements.items():
@@ -348,7 +339,7 @@ def _attach_members(self, tree, version=1, encoding=None):
     def to_string(self, version=1, encoding=None, pretty_print=None):
         """Converts this object to XML."""
 
-        tree_string = ElementTree.tostring(self._to_tree(version, encoding))
+        tree_string = ElementTree.tostring(self._to_tree(version))
 
         if pretty_print and xmlString is not None:
             return xmlString(tree_string).toprettyxml()
@@ -362,7 +353,7 @@ def __str__(self):
 
     def _become_child(self, tree, version=1):
         """Adds a child element to tree with the XML data in self."""
-        new_child = ElementTree.Element('')
+        new_child = ElementTree.Element(_get_qname(self, version))
         tree.append(new_child)
         new_child.tag = _get_qname(self, version)
         self._attach_members(new_child, version)
@@ -497,11 +488,11 @@ def _qname_matches(tag, namespace, qname):
                 and member_namespace is None))
 
 
-def parse(xml_string, target_class=None, version=1, encoding=None):
+def parse(xml_string, target_class=None, version=1):
     """Parses the XML string according to the rules for the target_class.
 
     Args:
-      xml_string: str or unicode
+      xml_string: bytes
       target_class: XmlElement or a subclass. If None is specified, the
           XmlElement class is used.
       version: int (optional) The version of the schema which should be used when
@@ -511,11 +502,8 @@ def parse(xml_string, target_class=None, version=1, encoding=None):
     """
     if target_class is None:
         target_class = XmlElement
-    if isinstance(xml_string, str):
-        if encoding is None:
-            xml_string = xml_string.encode(STRING_ENCODING)
-        else:
-            xml_string = xml_string.encode(encoding)
+    if not isinstance(xml_string, bytes):
+        raise Exception("This function only accepts bytes")
     tree = ElementTree.fromstring(xml_string)
     return _xml_element_from_tree(tree, target_class, version)
 

src/atom/http.py

@@ -112,19 +112,18 @@ def request(self, operation, url, data=None, headers=None):
             return self.v2_http_client.request(http_request=http_request)
 
         if not isinstance(url, atom.url.Url):
-            if isinstance(url, (str,)):
+            if isinstance(url, str):
                 url = atom.url.parse_url(url)
             else:
-                raise atom.http_interface.UnparsableUrlObject('Unable to parse url '
-                                                              'parameter because it was not a string or atom.url.Url')
+                raise atom.http_interface.UnparsableUrlObject('Unable to parse url parameter because it was not a string or atom.url.Url')
 
         connection = self._prepare_connection(url, all_headers)
 
         if self.debug:
             connection.debuglevel = 1
 
-        connection.putrequest(operation, self._get_access_url(url),
-                              skip_host=True)
+        connection.putrequest(operation, self._get_access_url(url), skip_host=True)
+
         if url.port is not None:
             connection.putheader('Host', '%s:%s' % (url.host, url.port))
         else:

src/atom/http_core.py

@@ -186,7 +186,7 @@ def add_form_inputs(self, form_data,
                      to 'application/x-www-form-urlencoded'.
         """
         body = urllib.parse.urlencode(form_data)
-        self.add_body_part(body, mime_type)
+        self.add_body_part(body, bytes(mime_type, 'ascii'))
 
     AddFormInputs = add_form_inputs
 

src/atom/service.py

@@ -33,16 +33,7 @@
 import atom.token_store
 import atom.url
 
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    try:
-        import cElementTree as ElementTree
-    except ImportError:
-        try:
-            from xml.etree import ElementTree
-        except ImportError:
-            from elementtree import ElementTree
+import lxml.etree as ElementTree
 import atom
 
 

src/gdata/__init__.py

@@ -16,16 +16,7 @@
 
 import atom
 
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    try:
-        import cElementTree as ElementTree
-    except ImportError:
-        try:
-            from xml.etree import ElementTree
-        except ImportError:
-            from elementtree import ElementTree
+import lxml.etree as ElementTree
 
 # XML namespaces which are often used in GData entities.
 GDATA_NAMESPACE = 'http://schemas.google.com/g/2005'

src/gdata/apps/service.py

@@ -6,16 +6,7 @@
 
 # __author__ = 'tmatsuo@sios.com (Takashi MATSUO)'
 
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    try:
-        import cElementTree as ElementTree
-    except ImportError:
-        try:
-            from xml.etree import ElementTree
-        except ImportError:
-            from elementtree import ElementTree
+import lxml.etree as ElementTree
 import gdata
 import gdata.apps
 import gdata.service

src/gdata/calendar/__init__.py

@@ -9,16 +9,7 @@
 
 # __author__ = 'api.vli (Vivian Li), api.rboyd (Ryan Boyd)'
 
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    try:
-        import cElementTree as ElementTree
-    except ImportError:
-        try:
-            from xml.etree import ElementTree
-        except ImportError:
-            from elementtree import ElementTree
+import lxml.etree as ElementTree
 import atom
 import gdata
 

src/gdata/gauth.py

@@ -282,8 +282,7 @@ def __init__(self, token_string):
         self.token_string = token_string
 
     def modify_request(self, http_request):
-        http_request.headers['Authorization'] = '%s%s' % (PROGRAMMATIC_AUTH_LABEL,
-                                                          self.token_string)
+        http_request.headers['Authorization'] = '{}{}'.format(PROGRAMMATIC_AUTH_LABEL, str(self.token_string, 'ascii'))
 
     ModifyRequest = modify_request