[tor-commits] [stem/master] Drop '--encoding=ascii' from man command on FreeBSD

[atagar@xxxxxxxxxxxxxx]

commit fe1512cfd500135bb3e059a35cc4ecc0aeeb3ed1
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Sun Sep 3 14:36:26 2017 -0700

    Drop '--encoding=ascii' from man command on FreeBSD
    
    We ran into issues with this argument on OSX. Turns out it's a no-go on FreeBSD
    too...
    
      https://trac.torproject.org/projects/tor/ticket/23281#comment:7
---
 stem/manual.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/manual.py b/stem/manual.py
index 18a5d34d..6e4869cf 100644
--- a/stem/manual.py
+++ b/stem/manual.py
@@ -485,7 +485,7 @@ class Manual(object):
     :raises: **IOError** if unable to retrieve the manual
     """
 
-    man_cmd = 'man %s -P cat %s' % ('' if stem.util.system.is_mac() else '--encoding=ascii', man_path)
+    man_cmd = 'man %s -P cat %s' % ('' if (stem.util.system.is_mac() or stem.util.system.is_bsd()) else '--encoding=ascii', 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