Merge lp:~blake-rouse/simplestreams/fix-1523682 into lp:~smoser/simplestreams/trunk

[Blake Rouse]

Fix UrlContentSource and FdContentSource read method to work with python3.

[lp:~blake-rouse/simplestreams/fix-1523682]

419. By Blake Rouse on 2015-12-07

Put back fix.

420. By Blake Rouse on 2015-12-07

Handle None.

421. By Blake Rouse on 2015-12-07

Fix divereged.

422. By Blake Rouse on 2015-12-07

RequestsUrlReader does not handle read(None) correctly in python3.

423. By Blake Rouse on 2015-12-07

Fix the issue and add tests to prove it.

=== modified file 'simplestreams/contentsource.py'
--- simplestreams/contentsource.py	2015-09-22 20:10:39 +0000
+++ simplestreams/contentsource.py	2015-12-07 22:43:32 +0000
@@ -140,7 +140,12 @@
     def read(self, size=-1):
         if self.fd is None:
             self.open()
-
+        if sys.version_info > (3, 0):
+            if size is not None and size < 0:
+                size = None
+        else:
+            if size is None:
+                size = -1
         return self.fd.read(size)
 
     def set_start_pos(self, offset):
@@ -382,8 +387,6 @@
             self._read = self.read_raw
 
     def read(self, size=-1):
-        if size < 0:
-            size = None
         return self._read(size)
 
     def read_compressed(self, size=None):
 
=== modified file 'tests/unittests/test_contentsource.py'
--- tests/unittests/test_contentsource.py	2014-07-15 21:35:36 +0000
+++ tests/unittests/test_contentsource.py	2015-12-07 22:43:32 +0000
@@ -33,6 +33,39 @@
         self.process.kill()  # pylint: disable=E1101
 
 
+class TestUrlContentSource(TestCase):
+
+    def setUp(self):
+        self.source = tempfile.mkdtemp()
+        with open(join(self.source, 'foo'), 'wb') as f:
+            f.write(b'hello world\n')
+
+    def tearDown(self):
+        shutil.rmtree(self.source)
+
+    def test_url_read_handles_None(self):
+        with RandomPortServer(self.source) as server:
+            loc = 'http://localhost:%d/foo' % server.port
+            scs = contentsource.UrlContentSource(loc)
+            scs.read(None)
+
+    def test_url_read_handles_negative_size(self):
+        with RandomPortServer(self.source) as server:
+            loc = 'http://localhost:%d/foo' % server.port
+            scs = contentsource.UrlContentSource(loc)
+            scs.read(-1)
+
+    def test_fd_read_handles_None(self):
+        loc = 'file://%s/foo' % self.source
+        scs = contentsource.UrlContentSource(loc)
+        scs.read(None)
+
+    def test_fd_read_handles_negative_size(self):
+        loc = 'file://%s/foo' % self.source
+        scs = contentsource.UrlContentSource(loc)
+        scs.read(-1)
+
+
 class TestResume(TestCase):
     def setUp(self):
         self.target = tempfile.mkdtemp()