forked from pool/python-PyWebDAV3
96009edb8d
- Include fix_unicode_issues.patch Upstream fix, should be in next release.68c5fb9428- Include fix_python2_urllib.patch Upstream fix, should be in next release.62e67e5523eb4017d889OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyWebDAV3?expand=0&rev=1
76 lines
2.0 KiB
Diff
76 lines
2.0 KiB
Diff
From 62e67e5523b6f8a3d47e1406d045c9e2abb9e8ba Mon Sep 17 00:00:00 2001
|
|
From: Andrew Leech <andrew@alelec.net>
|
|
Date: Tue, 16 Aug 2016 20:00:17 +1000
|
|
Subject: [PATCH] Fix python 2 import error
|
|
|
|
---
|
|
pywebdav/lib/propfind.py | 1 -
|
|
pywebdav/lib/davcopy.py | 1 -
|
|
pywebdav/lib/davmove.py | 1 -
|
|
pywebdav/lib/locks.py | 1 -
|
|
pywebdav/lib/utils.py | 3 ---
|
|
5 files changed, 7 deletions(-)
|
|
|
|
diff --git a/pywebdav/lib/davcopy.py b/pywebdav/lib/davcopy.py
|
|
index 9c7b71d..3ee6c6a 100644
|
|
--- a/pywebdav/lib/davcopy.py
|
|
+++ b/pywebdav/lib/davcopy.py
|
|
@@ -5,7 +5,6 @@
|
|
import sys
|
|
import string
|
|
from six.moves import urllib
|
|
-import urllib.parse
|
|
from io import StringIO
|
|
|
|
from . import utils
|
|
diff --git a/pywebdav/lib/davmove.py b/pywebdav/lib/davmove.py
|
|
index dce71f0..155208e 100644
|
|
--- a/pywebdav/lib/davmove.py
|
|
+++ b/pywebdav/lib/davmove.py
|
|
@@ -1,6 +1,5 @@
|
|
from __future__ import absolute_import
|
|
from six.moves import urllib
|
|
-import urllib.parse
|
|
|
|
from . import utils
|
|
from .constants import COLLECTION, OBJECT, DAV_PROPS
|
|
diff --git a/pywebdav/lib/locks.py b/pywebdav/lib/locks.py
|
|
index 01b8544..05b9969 100644
|
|
--- a/pywebdav/lib/locks.py
|
|
+++ b/pywebdav/lib/locks.py
|
|
@@ -1,7 +1,6 @@
|
|
from __future__ import absolute_import
|
|
import time
|
|
from six.moves import urllib
|
|
-import urllib.parse
|
|
import random
|
|
|
|
import logging
|
|
diff --git a/pywebdav/lib/utils.py b/pywebdav/lib/utils.py
|
|
index 6fb1897..bbc6098 100755
|
|
--- a/pywebdav/lib/utils.py
|
|
+++ b/pywebdav/lib/utils.py
|
|
@@ -3,10 +3,7 @@
|
|
import re
|
|
|
|
from xml.dom import minidom
|
|
-
|
|
from six.moves import urllib
|
|
-import urllib.parse
|
|
-
|
|
from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
|
|
from six.moves.BaseHTTPServer import BaseHTTPRequestHandler
|
|
|
|
diff --git a/pywebdav/lib/propfind.py b/pywebdav/lib/propfind.py
|
|
index e87754c..5596af0 100644
|
|
--- a/pywebdav/lib/propfind.py
|
|
+++ b/pywebdav/lib/propfind.py
|
|
@@ -4,7 +4,6 @@
|
|
|
|
import logging
|
|
from six.moves import urllib
|
|
-import urllib.parse
|
|
|
|
from . import utils
|
|
from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
|