Fix more brokenness.

Author: brianmay

sshuttle/methods/pf.py

@@ -233,7 +233,7 @@ def setup_firewall(self, port, dnsport, nslist, family, subnets, udp):
             pfctl('-a sshuttle -F all')
             if sys.platform == "darwin":
                 if _pf_context['Xtoken'] is not None:
-                    pfctl('-X %s' % _pf_context['Xtoken'])
+                    pfctl('-X %s' % _pf_context['Xtoken'].decode("ASCII"))
             elif _pf_context['started_by_sshuttle']:
                 pfctl('-d')
 

sshuttle/tests/test_methods_pf.py

@@ -176,7 +176,7 @@ def test_setup_firewall(mock_pf_get_dev, mock_ioctl, mock_pfctl):
     assert mock_ioctl.mock_calls == []
     assert mock_pfctl.mock_calls == [
         call('-a sshuttle -F all'),
-        call("-X b'abcdefg'"),
+        call("-X abcdefg"),
     ]
     mock_pf_get_dev.reset_mock()
     mock_pfctl.reset_mock()