From: Christian Heimes <christian@cheimes.de>
Date: Wed, 31 Oct 2007 19:40:17 +0000 (+0000)
Subject: Fixed test_dumbdbm
X-Git-Tag: v3.0a2~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9289bfcf54cfbfcf0bdc6cc61244adc38b03494b;p=thirdparty%2FPython%2Fcpython.git

Fixed test_dumbdbm
The test failed on Windows. I hope the change follows the spirit of the test. On Unix it checks if dumbdbm can handle Windows line separators and on Windows it tests with Unix line separators.
---

diff --git a/Lib/test/test_dumbdbm.py b/Lib/test/test_dumbdbm.py
index 44bb36941c95..3553c1961dec 100644
--- a/Lib/test/test_dumbdbm.py
+++ b/Lib/test/test_dumbdbm.py
@@ -113,9 +113,12 @@ class DumbDBMTestCase(unittest.TestCase):
         f[b'2'] = b'hello2'
         f.close()
 
-        # Mangle the file by adding \r before each newline
+        # Mangle the file by changing the line separator to Windows or Unix
         data = io.open(_fname + '.dir', 'rb').read()
-        data = data.replace(b'\n', b'\r\n')
+        if os.linesep == b'\n':
+            data = data.replace(b'\n', b'\r\n')
+        else:
+            data = data.replace(b'\r\n', b'\n')
         io.open(_fname + '.dir', 'wb').write(data)
 
         f = dumbdbm.open(_fname)