Switch back to python-pbs, for now.

chrippa · chrippa · commit aaf3764c06fd · 2012-10-19T20:16:11.000+02:00
Was maybe a bit hasty decision to switch to python-sh since
it does not support Python 3.3 and Windows yet.

Will switch back when at least Python 3.3 is supported and
use pbs on Windows if necessary.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Livestreamer and it's plugins currently depends on these software:
 
 These will be installed automatically by the setup script if they are missing:
 * python-requests (at least version 0.12.1)
-* python-sh
+* python-pbs
 * python-argparse (only needed for Python version < 2.7)
 
 For RTMP based plugins:
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from sys import version_info
 
 version = "1.3.2"
-deps = ["sh", "requests>=0.12.1"]
+deps = ["pbs", "requests>=0.12.1"]
 packages = ["livestreamer",
             "livestreamer.stream",
             "livestreamer.plugins",
diff --git a/src/livestreamer/compat.py b/src/livestreamer/compat.py
@@ -28,6 +28,10 @@ def bytes(b, enc="ascii"):
     from urlparse import urlparse, urljoin, parse_qs
     from urllib import quote, unquote
 
+import pbs as sh
+
+pbs_compat = True
+
 __all__ = ["is_py2", "is_py3", "is_win32", "input", "stdout",
            "str", "bytes", "urlparse", "urljoin", "parse_qs",
-           "quote", "unquote"]
+           "quote", "unquote", "sh", "pbs_compat"]
diff --git a/src/livestreamer/stream/__init__.py b/src/livestreamer/stream/__init__.py
@@ -1,4 +1,4 @@
-from ..compat import str
+from ..compat import str, sh, pbs_compat
 from ..utils import RingBuffer
 
 import os
@@ -32,10 +32,12 @@ def __init__(self, session, params={}, timeout=30):
         self.params = params
         self.params["_bg"] = True
         self.params["_err"] = open(os.devnull, "w")
-        self.params["_out_bufsize"] = 8192
         self.errorlog = self.session.options.get("errorlog")
-        self.fd = None
-        self.timeout = timeout
+
+        if not pbs_compat:
+            self.fd = None
+            self.timeout = timeout
+            self.params["_out_bufsize"] = 8192
 
     def cmdline(self):
         return str(self.cmd.bake(**self.params))
@@ -46,30 +48,36 @@ def write_callback(data, queue, process):
             self.fd.write(data)
             self.process_alive = process.alive
 
-        self.fd = RingBuffer()
-        self.last_data_time = time.time()
-
         if self.errorlog:
             tmpfile = tempfile.NamedTemporaryFile(prefix="livestreamer",
                                                   suffix=".err", delete=False)
             self.params["_err"] = tmpfile
 
-        self.params["_out"] = write_callback
+        if not pbs_compat:
+            self.fd = RingBuffer()
+            self.last_data_time = time.time()
+            self.params["_out"] = write_callback
 
         stream = self.cmd(**self.params)
 
         # Wait 0.5 seconds to see if program exited prematurely
         time.sleep(0.5)
 
-        self.process_alive = stream.process.alive
+        if pbs_compat:
+            self.process_alive = stream.process.returncode is None
+        else:
+            self.process_alive = stream.process.alive
 
         if not self.process_alive:
             if self.errorlog:
                 raise StreamError(("Error while executing subprocess, error output logged to: {0}").format(tmpfile.name))
             else:
                 raise StreamError("Error while executing subprocess")
 
-        return self
+        if pbs_compat:
+            return stream.process.stdout
+        else:
+            return self
 
     def read(self, size=-1):
         if not self.fd:
diff --git a/src/livestreamer/stream/rtmpdump.py b/src/livestreamer/stream/rtmpdump.py
@@ -1,7 +1,5 @@
 from . import StreamProcess, StreamError
-from ..compat import str, is_win32
-
-import sh
+from ..compat import str, sh, is_win32
 
 class RTMPStream(StreamProcess):
     def __init__(self, session, params):
