kallithea Changeset - 3c0ae44557c4

Changeset - 3c0ae44557c4

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-09-03 19:47:23
marcin@python-works.com

more py2.5 compatibility patches

3 files changed with 22 insertions and 13 deletions:

rhodecode/lib/compat.py

rhodecode/lib/subprocessio.py

rhodecode/tests/test_libs.py

0 comments (0 inline, 0 general)

rhodecode/lib/compat.py

➞

Show inline comments

@@ @@ -404,26 +404,35 @@ try: @@
     from io import BytesIO
 except ImportError:
     from cStringIO import StringIO as BytesIO
 #==============================================================================
 # bytes
 #==============================================================================
 if __py_version__ >= (2, 6):
     _bytes = bytes
 else:
     # in py2.6 bytes is a synonim for str
     _bytes = str
 #==============================================================================
 # deque
 #==============================================================================
 if __py_version__ >= (2, 6):
     from collections import deque
 else:
     #need to implement our own deque with maxlen
     class deque(object):
         def __init__(self, iterable=(), maxlen=-1):
+        def __init__(self, iterable=(), maxlen= -1):
             if not hasattr(self, 'data'):
                 self.left = self.right = 0
                 self.data = {}
             self.maxlen = maxlen
+            self.maxlen = maxlen or -1
             self.extend(iterable)
         def append(self, x):
             self.data[self.right] = x
             self.right += 1
             if self.maxlen != -1 and len(self) > self.maxlen:
@@ @@ -534,15 +543,15 @@ else: @@
 #==============================================================================
 # threading.Event
 #==============================================================================
 if __py_version__ >= (2, 6):
     from threading import Event
+    from threading import Event, Thread
 else:
     from threading import _Verbose, Condition, Lock
+    from threading import _Verbose, Condition, Lock, Thread
     def Event(*args, **kwargs):
         return _Event(*args, **kwargs)
     class _Event(_Verbose):

rhodecode/lib/subprocessio.py

➞

Show inline comments

@@ @@ -21,30 +21,29 @@ GNU Lesser General Public License for mo @@
 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/>.
 '''
 import os
 import subprocess
 import threading
 from rhodecode.lib.compat import deque, Event
 from rhodecode.lib.compat import deque, Event, Thread, _bytes
-class StreamFeeder(threading.Thread):
 class StreamFeeder(Thread):
     """
     Normal writing into pipe-like is blocking once the buffer is filled.
     This thread allows a thread to seep data from a file-like into a pipe
     without blocking the main thread.
     We close inpipe once the end of the source stream is reached.
     """
     def __init__(self, source):
         super(StreamFeeder, self).__init__()
         self.daemon = True
         filelike = False
         self.bytes = bytes()
         if type(source) in (type(''), bytes, bytearray):  # string-like
             self.bytes = bytes(source)
         self.bytes = _bytes()
         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
                 ## converting file descriptor (int) stdin into file-like
                 try:
                     source = os.fdopen(source, 'rb', 16384)
                 except Exception:
@@ @@ -74,13 +73,13 @@ class StreamFeeder(threading.Thread): @@
     @property
     def output(self):
         return self.readiface
-class InputStreamChunker(threading.Thread):
 class InputStreamChunker(Thread):
     def __init__(self, source, target, buffer_size, chunk_size):
         super(InputStreamChunker, self).__init__()
         self.daemon = True  # die die die.
@@ @@ -118,12 +117,13 @@ class InputStreamChunker(threading.Threa @@
         cs = self.chunk_size
         ccm = self.chunk_count_max
         kr = self.keep_reading
         da = self.data_added
         go = self.go
         b = s.read(cs)
         while b and go.is_set():
             if len(t) > ccm:
                 kr.clear()
                 kr.wait(2)
 #                # this only works on 2.7.x and up
 #                if not kr.wait(10):
@@ @@ -177,13 +177,13 @@ class BufferedGenerator(): @@
     def next(self):
         while not len(self.data) and not self.worker.EOF.is_set():
             self.worker.data_added.clear()
             self.worker.data_added.wait(0.2)
         if len(self.data):
             self.worker.keep_reading.set()
-            return bytes(self.data.popleft())
+            return _bytes(self.data.popleft())
         elif self.worker.EOF.is_set():
             raise StopIteration
     def throw(self, type, value=None, traceback=None):
         if not self.worker.EOF.is_set():
             raise type(value)

rhodecode/tests/test_libs.py

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import with_statement
 import unittest
 import datetime
 import hashlib
 import mock
 from rhodecode.tests import *

0 comments (0 inline, 0 general)