From: Brian Warner <warner@lothar.com>
Date: Tue, 26 May 2015 15:06:06 +0000 (-0700)
Subject: refactor scripts/common.py: move _default_nodedir out to its own file
X-Git-Tag: allmydata-tahoe-1.10.1b1~14^2~4
X-Git-Url: https://git.rkrishnan.org/specifications/reliability?a=commitdiff_plain;h=1c34cbd6278594ed6df9fad4ab1bcb3a2a9c4eaf;p=tahoe-lafs%2Ftahoe-lafs.git

refactor scripts/common.py: move _default_nodedir out to its own file
---

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
diff --git a/src/allmydata/scripts/default_nodedir.py b/src/allmydata/scripts/default_nodedir.py
new file mode 100644
index 00000000..4f390dd9
--- /dev/null
+++ b/src/allmydata/scripts/default_nodedir.py
@@ -0,0 +1,17 @@
+
+import sys
+from allmydata.util.assertutil import precondition
+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