tweaks to fix merge issues

2017-01-23 21:07:20 -05:00
parent 85131e6166
commit c0ecc6a329
2 changed files with 5 additions and 5 deletions
--- a/service/pycrest/eve.py
+++ b/service/pycrest/eve.py
@@ -13,9 +13,9 @@ from service.pycrest.compat import bytes_, text_
 from service.pycrest.errors import APIException

 try:
-    from urllib.parse import urlparse, urlunparse, parse_qsl, quote
+    from urllib.parse import urlparse, urlunparse, parse_qsl
 except ImportError:  # pragma: no cover
-    from urlparse import urlparse, urlunparse, parse_qsl, quote
+    from urlparse import urlparse, urlunparse, parse_qsl

 try:
    import pickle