fnexe.com/pypiserver
1
0
Fork 0
forked from github.com/pypiserver
Code Pull Requests Activity

#55: Do not require passlib when -P == '.'.

Browse Source
This commit is contained in:
Kostis Anagnostopoulos at STUW025 2015-09-11 17:29:08 +02:00
parent 1bd5b3973c
commit 000e977978
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pypiserver/_app.py
View File

@ -116,7 +116,7 @@ def configure(root=None,
config.redirect_to_fallback = redirect_to_fallback config.redirect_to_fallback = redirect_to_fallback
config.fallback_url = fallback_url config.fallback_url = fallback_url
config.cache_control = cache_control config.cache_control = cache_control
if password_file: if password_file and password_file != '.':
from passlib.apache import HtpasswdFile # @UnresolvedImport from passlib.apache import HtpasswdFile # @UnresolvedImport
config.htpasswdfile = HtpasswdFile(password_file) config.htpasswdfile = HtpasswdFile(password_file)
config.overwrite = overwrite config.overwrite = overwrite

2
tests/test_main.py
View File

@ -130,7 +130,5 @@ def test_password_alone(main, monkeypatch):
assert main.app.module.config.authenticated == ['update'] assert main.app.module.config.authenticated == ['update']
def test_dot_password_without_auth_list(main, monkeypatch): def test_dot_password_without_auth_list(main, monkeypatch):
monkeypatch.setitem(sys.modules, 'passlib', mock.MagicMock())
monkeypatch.setitem(sys.modules, 'passlib.apache', mock.MagicMock())
main(["-P", ".", "-a", ""]) main(["-P", ".", "-a", ""])
assert main.app.module.config.authenticated == [] assert main.app.module.config.authenticated == []