Merge pull request #133 from joakim-hove/config-dict-assume-cwd

Will assume cwd is CONFIG_DIRECTORY not set.

python/python/res/enkf/res_config.py

@@ -121,21 +121,21 @@ def _assert_keys(self, mother_key, exp_keys, keys):
 
     def _extract_internals(self, config):
         internal_config = []
-        config_dir = None
+        config_dir = os.getcwd()
 
         if ConfigKeys.INTERNALS in config:
             intercon = config[ConfigKeys.INTERNALS]
 
             dir_key = ConfigKeys.CONFIG_DIRECTORY
             if dir_key in intercon:
                 config_dir = os.path.realpath(intercon[dir_key])
-                internal_config.append((dir_key, config_dir))
 
             internal_filter = [dir_key]
             for key, value in intercon.iteritems():
                 if key not in internal_filter:
                     internal_config.append((key, self._parse_value(value)))
 
+        internal_config.append((ConfigKeys.CONFIG_DIRECTORY, config_dir))
         return config_dir, internal_config
 
 
@@ -325,10 +325,6 @@ def _build_config_content(self, config):
         config_content = ConfigContent(None)
         config_content.setParser(config_parser)
 
-        if config_dir is None:
-            raise ValueError("Expected config to specify %s"
-                             % ConfigKeys.CONFIG_DIRECTORY)
-
         # Insert defines
         for key in defines:
             config_content.add_define(key, defines[key])