X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Fscripts%2Fcommon.py;h=2894d3dd77723c50d219c62e2dda4b691c16ef96;hb=1c34cbd6278594ed6df9fad4ab1bcb3a2a9c4eaf;hp=55cb3f08c031e090fa96688849128b5f78d763eb;hpb=b5602463dcb3b6bd4e4f1fd2f98ef9d4ab1b250e;p=tahoe-lafs%2Ftahoe-lafs.git diff --git a/src/allmydata/scripts/common.py b/src/allmydata/scripts/common.py index 55cb3f08..2894d3dd 100644 --- a/src/allmydata/scripts/common.py +++ b/src/allmydata/scripts/common.py @@ -5,21 +5,7 @@ from twisted.python import usage from allmydata.util.assertutil import precondition from allmydata.util.encodingutil import unicode_to_url, quote_output, \ quote_local_unicode_path, argv_to_abspath -from allmydata.util.fileutil import abspath_expanduser_unicode - - -_default_nodedir = None -if sys.platform == 'win32': - from allmydata.windows import registry - path = registry.get_base_dir_path() - if path: - precondition(isinstance(path, unicode), path) - _default_nodedir = abspath_expanduser_unicode(path) - -if _default_nodedir is None: - path = abspath_expanduser_unicode(u"~/.tahoe") - precondition(isinstance(path, unicode), path) - _default_nodedir = path +from allmydata.scripts.default_nodedir import _default_nodedir def get_default_nodedir(): return _default_nodedir