Merge pull request #54 from sky-shiny/rebase-0.4.0

Rebase 0.4.0
sky-shiny · Dec 30, 2015 · 44f8797 · 44f8797
2 parents 217ba6f + 9be301c
commit 44f8797
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/charcoal/charcoal.py b/charcoal/charcoal.py
@@ -70,7 +70,7 @@ def __init__(self, test, host):
                              method="get",
                              outcomes=dict(expect_status_code=200, colour_output=True))
 
-        host_overrides = get_host_overrides(host, self.port)
+        host_overrides = get_host_overrides.get_host_overrides(host, self.port)
 
         if host_overrides['hostname'] is not None:
             self.host = host_overrides['hostname']
@@ -91,7 +91,8 @@ def __init__(self, test, host):
             proto = final_dict['protocol']
         except (AttributeError, KeyError):
             proto = None
-        (self.verify, self.verify_specified) = get_verify(verify, proto)
+
+        (self.verify, self.verify_specified) = get_verify.get_verify(verify, proto)
 
         self.test = deepcopy(final_dict)
         LOG.debug("Test with defaults: {0}".format(self.test))