move cfg_get_raw into hippotatlib

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/hippotat b/hippotat
index 379a184cf25b3a6fd1d231e475f137c7d1c13982..f9395f2e6a456d86dc48b422808d0b285de46ebf 100755 (executable)
--- a/hippotat
+++ b/hippotat
@@ -254,9 +254,6 @@ def process_cfg(_opts, putative_servers, putative_clients):
       c.max_queue_time  = srch(cfg.getint, 'max_queue_time')
       c.vroutes         = srch(cfg.get,    'vroutes')
 
-      def cfg_get_raw(*args, **kwargs):
-        return cfg.get(*args, raw=True, **kwargs)
-
       try: c.ifname     = srch(cfg_get_raw, 'ifname_client')
       except NoOptionError: pass
 

diff --git a/hippotatlib/__init__.py b/hippotatlib/__init__.py
index a4e7b693404f8f58e4365b1fa63cc670320191d3..7781c1f54c30b241a5afbec67f063ce2a68dd73c 100644 (file)
--- a/hippotatlib/__init__.py
+++ b/hippotatlib/__init__.py
@@ -484,6 +484,10 @@ def cfg_search_section(key,sections):
       return section
   raise NoOptionError(key, repr(sections))
 
+def cfg_get_raw(*args, **kwargs):
+  # for passing to cfg_search
+  return cfg.get(*args, raw=True, **kwargs)
+
 def cfg_search(getter,key,sections):
   section = cfg_search_section(key,sections)
   return getter(section, key)