kallithea Changeset - 9a99b574bb48

Changeset - 9a99b574bb48

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-07-06 19:05:50
marcin@python-works.com

py25 compatibility for subprocession module

1 file changed with 13 insertions and 11 deletions:

rhodecode/lib/subprocessio.py

0 comments (0 inline, 0 general)

rhodecode/lib/subprocessio.py

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICU @@
 GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with git_http_backend.py Project.
 If not, see <http://www.gnu.org/licenses/>.
 '''
 from __future__ import unicode_literals
 import os
 import subprocess
 import threading
 from collections import deque
@@ @@ -37,28 +38,29 @@ class StreamFeeder(threading.Thread): @@
     """
     def __init__(self, source):
         super(StreamFeeder, self).__init__()
         self.daemon = True
         filelike = False
         self.bytes = b''
         if type(source) in (type(''), bytes, bytearray): # string-like
+        if type(source) in (type(''), bytes, bytearray):  # string-like
             self.bytes = bytes(source)
         else: # can be either file pointer or file-like
             if type(source) in (int, long): # file pointer it is
         else:  # can be either file pointer or file-like
             if type(source) in (int, long):  # file pointer it is
                 ## converting file descriptor (int) stdin into file-like
                 try:
                     source = os.fdopen(source, 'rb', 16384)
                 except:
+                except Exception:
                     pass
             # let's see if source is file-like by now
             try:
                 filelike = source.read
             except:
+            except Exception:
                 pass
         if not filelike and not self.bytes:
             raise TypeError("StreamFeeder's source object must be a readable file-like, a file descriptor, or a string-like.")
             raise TypeError("StreamFeeder's source object must be a readable "
                             "file-like, a file descriptor, or a string-like.")
         self.source = source
         self.readiface, self.writeiface = os.pipe()
     def run(self):
         t = self.writeiface
         if self.bytes:
@@ @@ -322,17 +324,17 @@ class SubprocessIOChunker(object): @@
     '''
     def __init__(self, cmd, inputstream=None, buffer_size=65536,
                  chunk_size=4096, starting_values=[], **kwargs):
         '''
         Initializes SubprocessIOChunker
         @param cmd A Subprocess.Popen style "cmd". Can be string or array of strings
         @param inputstream (Default: None) A file-like, string, or file pointer.
         @param buffer_size (Default: 65536) A size of total buffer per stream in bytes.
         @param chunk_size (Default: 4096) A max size of a chunk. Actual chunk may be smaller.
         @param starting_values (Default: []) An array of strings to put in front of output que.
         :param cmd: A Subprocess.Popen style "cmd". Can be string or array of strings
         :param inputstream: (Default: None) A file-like, string, or file pointer.
         :param buffer_size: (Default: 65536) A size of total buffer per stream in bytes.
         :param chunk_size: (Default: 4096) A max size of a chunk. Actual chunk may be smaller.
         :param starting_values: (Default: []) An array of strings to put in front of output que.
         '''
         if inputstream:
             input_streamer = StreamFeeder(inputstream)
             input_streamer.start()
             inputstream = input_streamer.output

0 comments (0 inline, 0 general)