[CalendarServer-changes] [8968] CalendarServer/trunk/twext/web2

[source_changes at macosforge.org]

Revision: 8968
          http://trac.macosforge.org/projects/calendarserver/changeset/8968
Author:   wsanchez at apple.com
Date:     2012-04-02 17:49:37 -0700 (Mon, 02 Apr 2012)
Log Message:
-----------
Nothing uses substream().

Modified Paths:
--------------
    CalendarServer/trunk/twext/web2/stream.py
    CalendarServer/trunk/twext/web2/test/test_stream.py

Modified: CalendarServer/trunk/twext/web2/stream.py
===================================================================
--- CalendarServer/trunk/twext/web2/stream.py	2012-04-03 00:48:11 UTC (rev 8967)
+++ CalendarServer/trunk/twext/web2/stream.py	2012-04-03 00:49:37 UTC (rev 8968)
@@ -1160,15 +1160,7 @@
         return self._md5value
 
 
-def substream(stream, start, end):
-    if start > end:
-        raise ValueError("start position must be less than end position %r"
-                         % ((start, end),))
-    stream = stream.split(start)[1]
-    return stream.split(end - start)[0]
 
-
-
 __all__ = ['IStream', 'IByteStream', 'FileStream', 'MemoryStream', 'CompoundStream',
            'readAndDiscard', 'fallbackSplit', 'ProducerStream', 'StreamProducer',
            'BufferedStream', 'MD5Stream', 'readStream', 'ProcessStreamer', 'readIntoFile',

Modified: CalendarServer/trunk/twext/web2/test/test_stream.py
===================================================================
--- CalendarServer/trunk/twext/web2/test/test_stream.py	2012-04-03 00:48:11 UTC (rev 8967)
+++ CalendarServer/trunk/twext/web2/test/test_stream.py	2012-04-03 00:49:37 UTC (rev 8968)
@@ -166,40 +166,7 @@
 In the morning glad I see
 My foe outstretch'd beneath the tree"""
 
-class TestSubstream(unittest.TestCase):
 
-    def setUp(self):
-        self.data = testdata
-        self.s = stream.MemoryStream(self.data)
-
-    def suckTheMarrow(self, s):
-        return ''.join(map(str, list(iter(s.read, None))))
-
-    def testStart(self):
-        s = stream.substream(self.s, 0, 11)
-        self.assertEquals('I was angry', self.suckTheMarrow(s))
-
-    def testNotStart(self):
-        s = stream.substream(self.s, 12, 26)
-        self.assertEquals('with my friend', self.suckTheMarrow(s))
-
-    def testReverseStartEnd(self):
-        self.assertRaises(ValueError, stream.substream, self.s, 26, 12)
-
-    def testEmptySubstream(self):
-        s = stream.substream(self.s, 11, 11)
-        self.assertEquals('', self.suckTheMarrow(s))
-
-    def testEnd(self):
-        size = len(self.data)
-        s = stream.substream(self.s, size-4, size)
-        self.assertEquals('tree', self.suckTheMarrow(s))
-
-    def testPastEnd(self):
-        size = len(self.data)
-        self.assertRaises(ValueError, stream.substream, self.s, size-4, size+8)
-
-
 class TestBufferedStream(unittest.TestCase):
 
     def setUp(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120402/960322c1/attachment.html>