[tor-commits] [stem/master] Fix inversion of HAS_ENCODING_ARG

[atagar@xxxxxxxxxxxxxx]

commit 6c0d26e93949dce170a97d37d72b064d6e9790cd
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Mon Sep 11 09:57:33 2017 -0700

    Fix inversion of HAS_ENCODING_ARG
    
    Oops, fixing HAS_ENCODING_ARG caused another regression where 'two wrongs were
    making a right'. Caught thanks to our jenkins tests.
---
 stem/manual.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/manual.py b/stem/manual.py
index 2dd55747..df074c1b 100644
--- a/stem/manual.py
+++ b/stem/manual.py
@@ -486,7 +486,7 @@ class Manual(object):
     :raises: **IOError** if unable to retrieve the manual
     """
 
-    man_cmd = 'man %s -P cat %s' % ('' if HAS_ENCODING_ARG else '--encoding=ascii', man_path)
+    man_cmd = 'man %s -P cat %s' % ('--encoding=ascii' if HAS_ENCODING_ARG else '', man_path)
 
     try:
       man_output = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'})

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits