From fe3296f20328ae48711bc3f4f6e5bfb203602a85 Mon Sep 17 00:00:00 2001
From: Evgeny Ezhov <ezhov.evgeny@gmail.com>
Date: Wed, 27 Nov 2019 21:30:57 +0300
Subject: [PATCH] Support Python 2.7 in tests

---
 .travis.yml               | 1 +
 tests/test_client_unit.py | 8 ++++++--
 webdav3/client.py         | 7 ++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48814cb..9309718 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ services:
   - docker
 
 python:
+  - "2.7"
   - "3.7"
 
 before_install:
diff --git a/tests/test_client_unit.py b/tests/test_client_unit.py
index 4e4378b..be544d1 100644
--- a/tests/test_client_unit.py
+++ b/tests/test_client_unit.py
@@ -129,8 +129,12 @@ class ClientTestCase(TestCase):
         self.assertEqual(result, b'<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n<test/>')
 
     def test_parse_is_dir_response_directory(self):
-        f = open('./tests/response_dir.xml', encoding='utf-8')
-        content = f.read()
+        try:
+            f = open('./tests/response_dir.xml', encoding='utf-8')
+            content = f.read().encode('utf-8')
+        except:
+            f = open('./tests/response_dir.xml')
+            content = f.read().decode('utf-8').encode('utf-8')
         path = '/test_dir'
         hostname = 'https://webdav.yandex.ru'
         result = utils.parse_is_dir_response(content, path, hostname)
diff --git a/webdav3/client.py b/webdav3/client.py
index fecc5d4..8d138b8 100644
--- a/webdav3/client.py
+++ b/webdav3/client.py
@@ -2,15 +2,14 @@
 
 import functools
 import logging
+import lxml.etree as etree
 import os
+import requests
 import shutil
 import threading
 from io import BytesIO
 from re import sub
 
-import lxml.etree as etree
-import requests
-
 from webdav3.connection import *
 from webdav3.exceptions import *
 from webdav3.urn import Urn
@@ -977,8 +976,6 @@ class WebDavXmlUtils:
         """
         prefix = urlparse(hostname).path
         try:
-            if isinstance(content, str):
-                content = content.encode('utf-8')
             tree = etree.fromstring(content)
             responses = tree.findall("{DAV:}response")
             n_path = Urn.normalize_path(path)