Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove more six compatibility layer #47

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
Expand Down
2 changes: 1 addition & 1 deletion pywebdav/lib/WebDAVServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

"""
from . import AuthServer
from six.moves import urllib
import logging
import urllib.parse

from .propfind import PROPFIND
from .report import REPORT
Expand Down
5 changes: 2 additions & 3 deletions pywebdav/lib/davcmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

"""

from six.moves import urllib
import urllib.parse

from .utils import create_treelist, is_prefix
from .errors import *
from six.moves import range
from .errors import DAV_Error, DAV_NotFound
import os

def deltree(dc,uri,exclude={}):
Expand Down
4 changes: 2 additions & 2 deletions pywebdav/lib/davcopy.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
domimpl = xml.dom.minidom.getDOMImplementation()

import string
from six.moves import urllib
import urllib.parse
from io import StringIO

from . import utils
from .constants import COLLECTION, OBJECT, DAV_PROPS, RT_ALLPROP, RT_PROPNAME, RT_PROP
from .errors import *
from .errors import DAV_Error
from .utils import create_treelist, quote_uri, gen_estring

class COPY:
Expand Down
4 changes: 2 additions & 2 deletions pywebdav/lib/davmove.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from six.moves import urllib
import urllib.parse

from . import utils
from .constants import COLLECTION, OBJECT, DAV_PROPS
from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
from .errors import *
from .errors import DAV_Error
from .utils import create_treelist, quote_uri, gen_estring, make_xmlresponse, is_prefix
from .davcmd import moveone, movetree

Expand Down
2 changes: 1 addition & 1 deletion pywebdav/lib/iface.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from xml.dom import minidom
from .locks import LockManager
from .errors import *
from .errors import DAV_Forbidden, DAV_NotFound

import time

Expand Down
3 changes: 1 addition & 2 deletions pywebdav/lib/locks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import time
from six.moves import urllib
import urllib.parse
import uuid

import logging
Expand All @@ -10,7 +10,6 @@
from xml.dom import minidom

from .utils import rfc1123_date, IfParser, tokenFinder
from .errors import *

tokens_to_lock = {}
uris_to_token = {}
Expand Down
2 changes: 1 addition & 1 deletion pywebdav/lib/propfind.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
domimpl = xml.dom.minidom.getDOMImplementation()

import logging
from six.moves import urllib
import urllib.parse

from . import utils
from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
Expand Down
3 changes: 2 additions & 1 deletion pywebdav/lib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import os

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

Expand Down
6 changes: 3 additions & 3 deletions pywebdav/server/fshandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import types
import shutil
from io import StringIO
from six.moves import urllib
import urllib.parse
from pywebdav.lib.constants import COLLECTION, OBJECT
from pywebdav.lib.errors import *
from pywebdav.lib.iface import *
from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound, DAV_Requested_Range_Not_Satisfiable, DAV_Secret
from pywebdav.lib.iface import dav_interface
from pywebdav.lib.davcmd import copyone, copytree, moveone, movetree, delone, deltree
from html import escape

Expand Down
Loading