Merge pull request #333 from dkuznetsov/master

Added a safeguard in an example and fixed a test

examples/mpsrv.py

@@ -280,6 +280,9 @@ def start(self):
 
 
 def main():
+    if getattr(os, "fork", None) is None:
+        print("os.fork isn't supported by your OS")
+        return
     args = ARGS.parse_args()
     if ':' in args.host:
         args.host, port = args.host.split(':', 1)

tests/test_web_functional.py

@@ -154,8 +154,8 @@ def test_post_single_file(self):
 
         def check_file(fs):
             fullname = os.path.join(here, fs.filename)
-            with open(fullname, 'rb') as f:
-                test_data = f.read()
+            with open(fullname, 'r') as f:
+                test_data = f.read().encode()
                 data = fs.file.read()
                 self.assertEqual(test_data, data)
 
@@ -188,8 +188,8 @@ def test_post_files(self):
 
         def check_file(fs):
             fullname = os.path.join(here, fs.filename)
-            with open(fullname, 'rb') as f:
-                test_data = f.read()
+            with open(fullname, 'r') as f:
+                test_data = f.read().encode()
                 data = fs.file.read()
                 self.assertEqual(test_data, data)
 
@@ -265,7 +265,7 @@ def go(dirname, filename):
             resp = yield from request('GET', url, loop=self.loop)
             self.assertEqual(200, resp.status)
             txt = yield from resp.text()
-            self.assertEqual('file content\n', txt)
+            self.assertEqual('file content{}'.format(os.linesep), txt)
             ct = resp.headers['CONTENT-TYPE']
             self.assertEqual('application/octet-stream', ct)
             self.assertEqual(resp.headers.get('CONTENT-ENCODING'), None)