Update constructor to be backward compatiable

Also updates library property to be plural

Author: Erich-McMillan

src/robotremoteserver.py

@@ -48,11 +48,12 @@
 
 class RobotRemoteServer(object):
 
-    def __init__(self, library, host='127.0.0.1', port=8270, port_file=None,
+    def __init__(self, libraries, host='127.0.0.1', port=8270, port_file=None,
                  allow_stop='DEPRECATED', serve=True, allow_remote_stop=True):
         """Configure and start-up remote server.
 
-        :param library:     Test library instance or module to host.
+        :param libraries:     Test library instance or module to host, can be a
+                            list of modules to host.
         :param host:        Address to listen. Use ``'0.0.0.0'`` to listen
                             to all available interfaces.
         :param port:        Port to listen. Use ``0`` to select a free port
@@ -70,8 +71,11 @@ def __init__(self, library, host='127.0.0.1', port=8270, port_file=None,
                             ``Stop Remote Server`` keyword and
                             ``stop_remote_server`` XML-RPC method.
         """
-        self._library = [RemoteLibraryFactory(library_) 
-                         for library_ in library]
+        if isinstance(libraries, list):
+            self._libraries = [RemoteLibraryFactory(library_) 
+                         for library_ in libraries]
+        else:
+            self._libraries = [RemoteLibraryFactory(libraries)]
         self._server = StoppableXMLRPCServer(host, int(port))
         self._register_functions(self._server)
         self._port_file = port_file
@@ -169,33 +173,33 @@ def stop_remote_server(self, log=True):
 
     def get_keyword_names(self):
         keywords = ['stop_remote_server']
-        for l in self._library:
+        for l in self._libraries:
             keywords += l.get_keyword_names()
         return keywords
 
     def run_keyword(self, name, args, kwargs=None):
         if name == 'stop_remote_server':
             return KeywordRunner(self.stop_remote_server).run_keyword(args, kwargs)
-        library_ = next(l for l in self._library if name in l._names)
+        library_ = next(l for l in self._libraries if name in l._names)
         return library_.run_keyword(name, args, kwargs)
 
     def get_keyword_arguments(self, name):
         if name == 'stop_remote_server':
             return []
-        library_ = next(l for l in self._library if name in l._names)
+        library_ = next(l for l in self._libraries if name in l._names)
         return library_.get_keyword_arguments(name)
 
     def get_keyword_documentation(self, name):
         if name == 'stop_remote_server':
             return ('Stop the remote server unless stopping is disabled.\n\n'
                     'Return ``True/False`` depending was server stopped or not.')
-        library_ = next(l for l in self._library if name in l._names)
+        library_ = next(l for l in self._libraries if name in l._names)
         return library_.get_keyword_documentation(name)
 
     def get_keyword_tags(self, name):
         if name == 'stop_remote_server':
             return []
-        library_ = next(l for l in self._library if name in l._names)
+        library_ = next(l for l in self._libraries if name in l._names)
         return library_.get_keyword_tags(name)
 
 
@@ -284,7 +288,7 @@ def is_function_or_method(item):
 class StaticRemoteLibrary(object):
 
     def __init__(self, library):
-        self._library = library
+        self._libraries = library
         self._names, self._robot_name_index = self._get_keyword_names(library)
 
     def _get_keyword_names(self, library):
@@ -309,7 +313,7 @@ def run_keyword(self, name, args, kwargs=None):
     def _get_keyword(self, name):
         if name in self._robot_name_index:
             name = self._robot_name_index[name]
-        return getattr(self._library, name)
+        return getattr(self._libraries, name)
 
     def get_keyword_arguments(self, name):
         if __name__ == '__init__':
@@ -329,9 +333,9 @@ def get_keyword_arguments(self, name):
 
     def get_keyword_documentation(self, name):
         if name == '__intro__':
-            source = self._library
+            source = self._libraries
         elif name == '__init__':
-            source = self._get_init(self._library)
+            source = self._get_init(self._libraries)
         else:
             source = self._get_keyword(name)
         return inspect.getdoc(source) or ''
@@ -616,4 +620,4 @@ def parse_args(script, *args):
 
     action, uri = parse_args(*sys.argv)
     success = action(uri)
-    sys.exit(0 if success else 1)
+    sys.exit(0 if success else 1)