fix residual import issues with IPython.parallel reorganization

IPython/parallel/apps/ipclusterapp.py

@@ -26,7 +26,8 b' from zmq.eventloop import ioloop'
 
 from IPython.external.argparse import ArgumentParser, SUPPRESS
 from IPython.utils.importstring import import_item
-from .clusterdir import (
+
+from IPython.parallel.apps.clusterdir import (
     ApplicationWithClusterDir, ClusterDirConfigLoader,
     ClusterDirError, PIDFileError
 )
@@ -260,9 +261,9 b' class IPClusterApp(ApplicationWithClusterDir):'
     def create_default_config(self):
         super(IPClusterApp, self).create_default_config()
         self.default_config.Global.controller_launcher = \
-            'IPython.parallel.launcher.LocalControllerLauncher'
+            'IPython.parallel.apps.launcher.LocalControllerLauncher'
         self.default_config.Global.engine_launcher = \
-            'IPython.parallel.launcher.LocalEngineSetLauncher'
+            'IPython.parallel.apps.launcher.LocalEngineSetLauncher'
         self.default_config.Global.n = 2
         self.default_config.Global.delay = 2
         self.default_config.Global.reset_config = False

IPython/parallel/apps/ipcontrollerapp.py

@@ -32,7 +32,8 b' from zmq.utils import jsonapi as json'
 from IPython.config.loader import Config
 
 from IPython.parallel import factory
-from .clusterdir import (
+
+from IPython.parallel.apps.clusterdir import (
     ApplicationWithClusterDir,
     ClusterDirConfigLoader
 )

IPython/parallel/apps/ipengineapp.py

@@ -22,7 +22,7 b' import sys'
 import zmq
 from zmq.eventloop import ioloop
 
-from .clusterdir import (
+from IPython.parallel.apps.clusterdir import (
     ApplicationWithClusterDir,
     ClusterDirConfigLoader
 )

IPython/parallel/apps/iploggerapp.py

@@ -20,11 +20,11 b' import sys'
 
 import zmq
 
-from .clusterdir import (
+from IPython.parallel.apps.clusterdir import (
     ApplicationWithClusterDir,
     ClusterDirConfigLoader
 )
-from .logwatcher import LogWatcher
+from IPython.parallel.apps.logwatcher import LogWatcher
 
 #-----------------------------------------------------------------------------
 # Module level variables