Browse Source

Merge pull request #484 from tracim/fix/287/use_upstream_wsgidav

Damien Accorsi 7 years ago
parent
commit
c53260f78c
No account linked to committer's email
2 changed files with 3 additions and 3 deletions
  1. 1 1
      install/requirements.txt
  2. 2 2
      tracim/tracim/lib/daemons.py

+ 1 - 1
install/requirements.txt View File

57
 vobject==0.9.2
57
 vobject==0.9.2
58
 waitress==0.8.9
58
 waitress==0.8.9
59
 who_ldap==3.2.2
59
 who_ldap==3.2.2
60
--e git+https://github.com/algoo/wsgidav.git@py3#egg=wsgidav
60
+wsgidav==2.2.4
61
 zope.interface==4.1.3
61
 zope.interface==4.1.3
62
 zope.sqlalchemy==0.7.6
62
 zope.sqlalchemy==0.7.6
63
 PyYAML
63
 PyYAML

+ 2 - 2
tracim/tracim/lib/daemons.py View File

314
 from inspect import isfunction
314
 from inspect import isfunction
315
 import traceback
315
 import traceback
316
 
316
 
317
-from wsgidav.server.cherrypy import wsgiserver
318
-from wsgidav.server.cherrypy.wsgiserver.wsgiserver3 import CherryPyWSGIServer
317
+from cherrypy import wsgiserver
318
+from cherrypy.wsgiserver import CherryPyWSGIServer
319
 
319
 
320
 DEFAULT_CONFIG_FILE = "wsgidav.conf"
320
 DEFAULT_CONFIG_FILE = "wsgidav.conf"
321
 PYTHON_VERSION = "%s.%s.%s" % (sys.version_info[0], sys.version_info[1], sys.version_info[2])
321
 PYTHON_VERSION = "%s.%s.%s" % (sys.version_info[0], sys.version_info[1], sys.version_info[2])