andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change default value of MPD_SERVER_PASSWORD from False to None

Browse Source
This commit is contained in:
Stein Magnus Jodal 2011-01-21 16:31:35 +01:00
parent 7f4ce3be8a
commit e1197ed84c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/frontends/mpd/session.py
View File

@ -85,7 +85,7 @@ class MpdSession(asynchat.async_chat):
the response_message is :class:`None`, normal processing should
continue, even though the client may not be authenticated.
"""
if not settings.MPD_SERVER_PASSWORD:
if settings.MPD_SERVER_PASSWORD is None:
return (True, None)
command = request.split(' ')[0]
if command == 'password':

4
mopidy/settings.py
View File

@ -166,8 +166,8 @@ MPD_SERVER_HOSTNAME = u'127.0.0.1'
#: The password required for connecting to the MPD server.
#:
#: Default: :class:`False`, which means no password required.
MPD_SERVER_PASSWORD = False
#: Default: :class:`None`, which means no password required.
MPD_SERVER_PASSWORD = None
#: Which TCP port Mopidy's MPD server should listen to.
#:

2
tests/frontends/mpd/connection_test.py
View File

@ -36,7 +36,7 @@ class ConnectionHandlerTest(unittest.TestCase):
self.assert_(u'ACK [3@0] {password} incorrect password' in result)
def test_any_password_is_not_accepted_when_password_check_turned_off(self):
settings.MPD_SERVER_PASSWORD = False
settings.MPD_SERVER_PASSWORD = None
result = self.h.handle_request(u'password "secret"')
self.assert_(u'ACK [3@0] {password} incorrect password' in result)

2
tests/frontends/mpd/server_test.py
View File

@ -44,7 +44,7 @@ class MpdSessionTest(unittest.TestCase):
self.assertEqual(u'ACK [3@0] {password} incorrect password', response)
def test_authentication_with_anything_when_password_check_turned_off(self):
settings.MPD_SERVER_PASSWORD = False
settings.MPD_SERVER_PASSWORD = None
authed, response = self.session.check_password(u'any request at all')
self.assertTrue(authed)
self.assertEqual(None, response)