resort imports in a cleaner order

IPython/zmq/parallel/client.py

@@ -11,12 +11,13 b''
 #-----------------------------------------------------------------------------
 
 import os
+import json
 import time
+import warnings
+from datetime import datetime
 from getpass import getpass
 from pprint import pprint
-from datetime import datetime
-import warnings
-import json
+
 pjoin = os.path.join
 
 import zmq
@@ -26,16 +27,15 b' from IPython.utils.path import get_ipython_dir'
 from IPython.external.decorator import decorator
 from IPython.external.ssh import tunnel
 
-import streamsession as ss
-from clusterdir import ClusterDir, ClusterDirError
-# from remotenamespace import RemoteNamespace
-from view import DirectView, LoadBalancedView
-from dependency import Dependency, depend, require, dependent
 import error
 import map as Map
+import streamsession as ss
 from asyncresult import AsyncResult, AsyncMapResult
+from clusterdir import ClusterDir, ClusterDirError
+from dependency import Dependency, depend, require, dependent
 from remotefunction import remote,parallel,ParallelFunction,RemoteFunction
 from util import ReverseDict, disambiguate_url, validate_url
+from view import DirectView, LoadBalancedView
 
 #--------------------------------------------------------------------------
 # helpers for implementing old MEC API via client.apply

IPython/zmq/parallel/clusterdir.py

@@ -17,16 +17,16 b' The IPython cluster directory'
 
 from __future__ import with_statement
 
-import re
 import os
+import logging
+import re
 import shutil
 import sys
-import logging
 import warnings
 
 from IPython.config.loader import PyFileConfigLoader
-from IPython.core.application import Application, BaseAppConfigLoader
 from IPython.config.configurable import Configurable
+from IPython.core.application import Application, BaseAppConfigLoader
 from IPython.core.crashhandler import CrashHandler
 from IPython.core import release
 from IPython.utils.path import (

IPython/zmq/parallel/controller.py

@@ -24,10 +24,8 b' from IPython.utils.importstring import import_item'
 from IPython.utils.traitlets import Int, Str, Instance, List, Bool
 
 from entry_point import signal_children
-
-
-from scheduler import launch_scheduler
 from hub import Hub, HubFactory
+from scheduler import launch_scheduler
 
 #-----------------------------------------------------------------------------
 # Configurable

IPython/zmq/parallel/dependency.py

@@ -1,8 +1,9 b''
 """Dependency utilities"""
 
 from IPython.external.decorator import decorator
-from error import UnmetDependency
+
 from asyncresult import AsyncResult
+from error import UnmetDependency
 
 
 class depend(object):

IPython/zmq/parallel/engine.py

@@ -4,10 +4,11 b' it handles registration, etc. and launches a kernel'
 connected to the Controller's queue(s).
 """
 from __future__ import print_function
+
+import logging
 import sys
 import time
 import uuid
-import logging
 from pprint import pprint
 
 import zmq
@@ -18,12 +19,11 b' from IPython.config.configurable import Configurable'
 from IPython.utils.traitlets import Instance, Str, Dict, Int, Type, CFloat
 # from IPython.utils.localinterfaces import LOCALHOST 
 
+import heartmonitor
 from factory import RegistrationFactory
-from util import disambiguate_url
-
-from streamsession import Message
 from streamkernel import Kernel
-import heartmonitor
+from streamsession import Message
+from util import disambiguate_url
 
 def printer(*msg):
     # print (self.log.handlers, file=sys.__stdout__)

IPython/zmq/parallel/entry_point.py

@@ -7,14 +7,14 b' NOTE: Most of this module has been deprecated by moving to Configurables'
 """
 
 # Standard library imports.
-import logging
 import atexit
-import sys
+import logging
 import os
 import stat
 import socket
-from subprocess import Popen, PIPE
+import sys
 from signal import signal, SIGINT, SIGABRT, SIGTERM
+from subprocess import Popen, PIPE
 try:
     from signal import SIGKILL
 except ImportError:

IPython/zmq/parallel/factory.py

@@ -12,19 +12,18 b''
 #-----------------------------------------------------------------------------
 
 
-import os
 import logging
-
+import os
 import uuid
 
 from zmq.eventloop.ioloop import IOLoop
 
 from IPython.config.configurable import Configurable
-from IPython.utils.traitlets import Str,Int,Instance, CUnicode, CStr
 from IPython.utils.importstring import import_item
+from IPython.utils.traitlets import Str,Int,Instance, CUnicode, CStr
 
-from IPython.zmq.parallel.entry_point import select_random_ports
 import IPython.zmq.parallel.streamsession as ss
+from IPython.zmq.parallel.entry_point import select_random_ports
 
 #-----------------------------------------------------------------------------
 # Classes

IPython/zmq/parallel/heartmonitor.py

@@ -6,8 +6,8 b' and hearts are tracked based on their XREQ identities.'
 
 from __future__ import print_function
 import time
-import uuid
 import logging
+import uuid
 
 import zmq
 from zmq.devices import ProcessDevice,ThreadDevice

IPython/zmq/parallel/hub.py

@@ -15,10 +15,10 b' and monitors traffic through the various queues.'
 #-----------------------------------------------------------------------------
 from __future__ import print_function
 
+import logging
 import sys
-from datetime import datetime
 import time
-import logging
+from datetime import datetime
 
 import zmq
 from zmq.eventloop import ioloop
@@ -26,14 +26,14 b' from zmq.eventloop.zmqstream import ZMQStream'
 
 # internal:
 from IPython.config.configurable import Configurable
-from IPython.utils.traitlets import HasTraits, Instance, Int, CStr, Str, Dict, Set, List, Bool
 from IPython.utils.importstring import import_item
+from IPython.utils.traitlets import HasTraits, Instance, Int, CStr, Str, Dict, Set, List, Bool
 
 from entry_point import select_random_ports
 from factory import RegistrationFactory, LoggingFactory
 
-from streamsession import Message, wrap_exception, ISO8601
 from heartmonitor import HeartMonitor
+from streamsession import Message, wrap_exception, ISO8601
 from util import validate_url_container
 
 try:

IPython/zmq/parallel/ipcluster.py

@@ -1,6 +1,8 b''
 #!/usr/bin/env python
 from __future__ import print_function
-import sys,os
+
+import os
+import sys
 import time
 from subprocess import Popen, PIPE
 

IPython/zmq/parallel/ipclusterapp.py

@@ -15,12 +15,11 b' The ipcluster application.'
 # Imports
 #-----------------------------------------------------------------------------
 
-import re
+import errno
 import logging
 import os
+import re
 import signal
-import logging
-import errno
 
 import zmq
 from zmq.eventloop import ioloop

IPython/zmq/parallel/ipcontrollerapp.py

@@ -18,12 +18,11 b' The IPython controller application.'
 from __future__ import with_statement
 
 import copy
-import sys
 import os
 import logging
-import stat
 import socket
-
+import stat
+import sys
 import uuid
 
 import zmq

IPython/zmq/parallel/ipengineapp.py

@@ -15,9 +15,9 b' The IPython engine application'
 # Imports
 #-----------------------------------------------------------------------------
 
+import json
 import os
 import sys
-import json
 
 import zmq
 from zmq.eventloop import ioloop

IPython/zmq/parallel/launcher.py

@@ -15,10 +15,10 b' Facilities for launching IPython processes asynchronously.'
 # Imports
 #-----------------------------------------------------------------------------
 
+import logging
 import os
 import re
 import sys
-import logging
 
 from signal import SIGINT, SIGTERM
 try:

IPython/zmq/parallel/logwatcher.py

@@ -13,11 +13,12 b''
 #-----------------------------------------------------------------------------
 
 
-import sys
 import logging
+import sys
 
 import zmq
 from zmq.eventloop import ioloop, zmqstream
+
 from IPython.utils.traitlets import Int, Str, Instance, List
 
 from factory import LoggingFactory

IPython/zmq/parallel/mongodb.py

@@ -11,9 +11,11 b' from datetime import datetime'
 from pymongo import Connection
 
 from dictdb import BaseDB
-#----------------------
+
+#-----------------------------------------------------------------------------
 # MongoDB class
-#----------------------
+#-----------------------------------------------------------------------------
+
 class MongoDB(BaseDB):
     """MongoDB TaskRecord backend."""
     def __init__(self, session_uuid, *args, **kwargs):
@@ -22,7 +24,6 b' class MongoDB(BaseDB):'
         self._records = self._db['task_records']
         self._table = {}
     
-    
     def add_record(self, msg_id, rec):
         """Add a new Task Record, by msg_id."""
         # print rec

IPython/zmq/parallel/scheduler.py

@@ -10,11 +10,14 b' Python Scheduler exists.'
 #----------------------------------------------------------------------
 
 from __future__ import print_function
-import sys
+
 import logging
+import sys
+
+from datetime import datetime, timedelta
 from random import randint, random
 from types import FunctionType
-from datetime import datetime, timedelta
+
 try:
     import numpy
 except ImportError:
@@ -25,13 +28,11 b' from zmq.eventloop import ioloop, zmqstream'
 
 # local imports
 from IPython.external.decorator import decorator
-# from IPython.config.configurable import Configurable
 from IPython.utils.traitlets import Instance, Dict, List, Set
 
 import error
-# from client import Client
-from dependency import Dependency
 import streamsession as ss
+from dependency import Dependency
 from entry_point import connect_logger, local_logger
 from factory import SessionFactory
 

IPython/zmq/parallel/streamkernel.py

@@ -10,15 +10,17 b' Kernel adapted from kernel.py to use ZMQ Streams'
 # Standard library imports.
 from __future__ import print_function
 import __builtin__
-from code import CommandCompiler
+
+import logging
 import os
 import sys
 import time
 import traceback
-import logging
+
+from code import CommandCompiler
 from datetime import datetime
-from signal import SIGTERM, SIGKILL
 from pprint import pprint
+from signal import SIGTERM, SIGKILL
 
 # System library imports.
 import zmq
@@ -31,11 +33,11 b' from IPython.zmq.completer import KernelCompleter'
 from IPython.zmq.iostream import OutStream
 from IPython.zmq.displayhook import DisplayHook
 
+import heartmonitor
+from client import Client
 from factory import SessionFactory
 from streamsession import StreamSession, Message, extract_header, serialize_object,\
                 unpack_apply_message, ISO8601, wrap_exception
-import heartmonitor
-from client import Client
 
 def printer(*args):
     pprint(args, stream=sys.__stdout__)

IPython/zmq/parallel/streamsession.py

@@ -4,12 +4,19 b''
 
 
 import os
+import pprint
 import sys
 import traceback
-import pprint
 import uuid
 from datetime import datetime
 
+try:
+    import cPickle
+    pickle = cPickle
+except:
+    cPickle = None
+    import pickle
+
 import zmq
 from zmq.utils import jsonapi
 from zmq.eventloop.zmqstream import ZMQStream
@@ -19,13 +26,6 b' from IPython.utils.newserialized import serialize, unserialize'
 
 from IPython.zmq.parallel.error import RemoteError
 
-try:
-    import cPickle
-    pickle = cPickle
-except:
-    cPickle = None
-    import pickle
-
 # packer priority: jsonlib[2], cPickle, simplejson/json, pickle
 json_name = '' if not jsonapi.jsonmod else jsonapi.jsonmod.__name__
 if json_name in ('jsonlib', 'jsonlib2'):