[tor-commits] [chutney/master] Properly qualify class variables

[teor at torproject.org]

commit d86feecd02a0af114d72cdab27c88d681e0d1c83
Author: teor <teor2345 at gmail.com>
Date:   Wed Sep 13 09:03:58 2017 +1000

    Properly qualify class variables
    
    Unqualified class variables work in some pythons, but not in others.
    
    Fix on commit c889534 in 21903.
---
 lib/chutney/TorNet.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 3ace8a7..5d44128 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -890,8 +890,8 @@ class TorEnviron(chutney.Templating.Environ):
         elif my['dns_conf'] is None:
             # if there is no DNS conf file set
             print("CHUTNEY_DNS_CONF not specified, using '%s'."
-                  % (DEFAULT_DNS_RESOLV_CONF))
-            dns_conf = DEFAULT_DNS_RESOLV_CONF
+                  % (TorEnviron.DEFAULT_DNS_RESOLV_CONF))
+            dns_conf = TorEnviron.DEFAULT_DNS_RESOLV_CONF
         else:
             dns_conf = my['dns_conf']
         dns_conf = os.path.abspath(my['dns_conf'])
@@ -901,8 +901,8 @@ class TorEnviron(chutney.Templating.Environ):
         if not os.path.exists(dns_conf):
             # Issue a warning so the user notices
             print("CHUTNEY_DNS_CONF '%s' does not exist, using '%s'."
-                  % (dns_conf, OFFLINE_DNS_RESOLV_CONF))
-            dns_conf = OFFLINE_DNS_RESOLV_CONF
+                  % (dns_conf, TorEnviron.OFFLINE_DNS_RESOLV_CONF))
+            dns_conf = TorEnviron.OFFLINE_DNS_RESOLV_CONF
         return "ServerDNSResolvConfFile %s" % (dns_conf)