Upstream Android-specific net/ changes.

net/tools/testserver/testserver.py

Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 1cae65d226624f2de1d2d84f96feb35afa860013..99f9b34d715d2fbf5cb5da0cdbdf40b82adf6f1b 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -1970,7 +1970,7 @@ class SyncPageHandler(BasePageHandler):
     return True;
 
 
-def MakeDataDir():
+def MakeDataDir(options):
   if options.data_dir:
     if not os.path.isdir(options.data_dir):
       print 'specified data dir not found: ' + options.data_dir + ' exiting...'
@@ -2176,6 +2176,13 @@ class FileMultiplexer:
     self.__fd1.flush()
     self.__fd2.flush()
 
+  def close(self):
+    """Add this only for disabling error message from python because
+    FileMultiplexer acts as File Object, and File Object in python has
+    close method"""
+    pass

[Paweł Hajdan Jr., 2012/10/18 19:14:44]

Why don't we close our fds here like in __del__ ?

[newt (away), 2012/10/18 20:54:34]

Done.

+
+
 def main(options, args):
   logfile = open('testserver.log', 'w')
   sys.stderr = FileMultiplexer(sys.stderr, logfile)
@@ -2247,7 +2254,7 @@ def main(options, args):
       server = HTTPServer((host, port), TestPageHandler)
       print 'HTTP server started on %s:%d...' % (host, server.server_port)
 
-    server.data_dir = MakeDataDir()
+    server.data_dir = MakeDataDir(options)
     server.file_root_url = options.file_root_url
     server_data['port'] = server.server_port
     server._device_management_handler = None
@@ -2291,7 +2298,7 @@ def main(options, args):
     server_data['port'] = server.server_port
   # means FTP Server
   else:
-    my_data_dir = MakeDataDir()
+    my_data_dir = MakeDataDir(options)
 
     # Instantiate a dummy authorizer for managing 'virtual' users
     authorizer = pyftpdlib.ftpserver.DummyAuthorizer()