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

Move private methods to be closer it's caller

Browse Source
This commit is contained in:
Johannes Knutsen 2011-06-09 20:08:50 +02:00
parent ded513faed
commit c31db04979
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mopidy/utils/settings.py
View File

@ -19,20 +19,6 @@ class SettingsProxy(object):
self.local = self._get_local_settings() self.local = self._get_local_settings()
self.runtime = {} self.runtime = {}
def _read_missing_settings_from_stdin(self, default, local):
for setting, value in default.iteritems():
if isinstance(value, basestring) and len(value) == 0:
local[setting] = self._read_from_stdin(setting + u': ')
def _read_from_stdin(self, prompt):
if u'_PASSWORD' in prompt:
return (getpass.getpass(prompt)
.decode(getpass.sys.stdin.encoding, 'ignore'))
else:
sys.stdout.write(prompt)
return (sys.stdin.readline().strip()
.decode(sys.stdin.encoding, 'ignore'))
def _get_local_settings(self): def _get_local_settings(self):
dotdir = os.path.expanduser(u'~/.mopidy/') dotdir = os.path.expanduser(u'~/.mopidy/')
settings_file = os.path.join(dotdir, u'settings.py') settings_file = os.path.join(dotdir, u'settings.py')
@ -86,6 +72,20 @@ class SettingsProxy(object):
indent(self.get_errors_as_string())) indent(self.get_errors_as_string()))
raise SettingsError(u'Settings validation failed.') raise SettingsError(u'Settings validation failed.')
def _read_missing_settings_from_stdin(self, default, local):
for setting, value in default.iteritems():
if isinstance(value, basestring) and len(value) == 0:
local[setting] = self._read_from_stdin(setting + u': ')
def _read_from_stdin(self, prompt):
if u'_PASSWORD' in prompt:
return (getpass.getpass(prompt)
.decode(getpass.sys.stdin.encoding, 'ignore'))
else:
sys.stdout.write(prompt)
return (sys.stdin.readline().strip()
.decode(sys.stdin.encoding, 'ignore'))
def get_errors(self): def get_errors(self):
return validate_settings(self.default, self.local) return validate_settings(self.default, self.local)