From 000e9779783a8a8c134ca38ca00af4f8803aa936 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos at STUW025 Date: Fri, 11 Sep 2015 17:29:08 +0200 Subject: [PATCH] #55: Do not require `passlib` when -P == '.'. --- pypiserver/_app.py | 2 +- tests/test_main.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pypiserver/_app.py b/pypiserver/_app.py index 5dc17b5..224d76b 100644 --- a/pypiserver/_app.py +++ b/pypiserver/_app.py @@ -116,7 +116,7 @@ def configure(root=None, config.redirect_to_fallback = redirect_to_fallback config.fallback_url = fallback_url config.cache_control = cache_control - if password_file: + if password_file and password_file != '.': from passlib.apache import HtpasswdFile # @UnresolvedImport config.htpasswdfile = HtpasswdFile(password_file) config.overwrite = overwrite diff --git a/tests/test_main.py b/tests/test_main.py index 22b9bac..0fe253d 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -130,7 +130,5 @@ def test_password_alone(main, monkeypatch): assert main.app.module.config.authenticated == ['update'] 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", ""]) assert main.app.module.config.authenticated == []