Cleanup in index and options and improved options test coverage

nw/core/index.py

@@ -27,6 +27,7 @@
 
 import logging
 import json
+import nw
 
 from os import path
 from time import time
@@ -66,9 +67,9 @@ class NWIndex():
     def __init__(self, theProject, theParent):
 
         # Internal
+        self.mainConf    = nw.CONFIG
         self.theProject  = theProject
         self.theParent   = theParent
-        self.mainConf    = self.theParent.mainConf
         self.indexBroken = False
 
         # Indices

nw/core/options.py

@@ -28,7 +28,6 @@
 
 import logging
 import json
-import nw
 
 from os import path
 
@@ -40,9 +39,7 @@ class OptionState():
 
     def __init__(self, theProject):
 
-        self.mainConf   = nw.CONFIG
         self.theProject = theProject
-
         self.theState = {}
         self.validMap = {
             "GuiWritingStats": {