From d72427c65e831620eb9f562802a4732e15d1cf97 2011-04-08 00:38:20 From: MinRK Date: 2011-04-08 00:38:20 Subject: [PATCH] resort imports in a cleaner order --- diff --git a/IPython/zmq/parallel/client.py b/IPython/zmq/parallel/client.py index d165b71..0b5959f 100644 --- a/IPython/zmq/parallel/client.py +++ b/IPython/zmq/parallel/client.py @@ -11,12 +11,13 @@ #----------------------------------------------------------------------------- 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 @@ 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 diff --git a/IPython/zmq/parallel/clusterdir.py b/IPython/zmq/parallel/clusterdir.py index ab9cd2a..5b6d8e1 100755 --- a/IPython/zmq/parallel/clusterdir.py +++ b/IPython/zmq/parallel/clusterdir.py @@ -17,16 +17,16 @@ 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 ( diff --git a/IPython/zmq/parallel/controller.py b/IPython/zmq/parallel/controller.py index a3fc89e..2142c4b 100755 --- a/IPython/zmq/parallel/controller.py +++ b/IPython/zmq/parallel/controller.py @@ -24,10 +24,8 @@ 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 diff --git a/IPython/zmq/parallel/dependency.py b/IPython/zmq/parallel/dependency.py index 0a511cc..971a3f4 100644 --- a/IPython/zmq/parallel/dependency.py +++ b/IPython/zmq/parallel/dependency.py @@ -1,8 +1,9 @@ """Dependency utilities""" from IPython.external.decorator import decorator -from error import UnmetDependency + from asyncresult import AsyncResult +from error import UnmetDependency class depend(object): diff --git a/IPython/zmq/parallel/engine.py b/IPython/zmq/parallel/engine.py index 9e154c0..d866d3a 100755 --- a/IPython/zmq/parallel/engine.py +++ b/IPython/zmq/parallel/engine.py @@ -4,10 +4,11 @@ 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 @@ 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__) diff --git a/IPython/zmq/parallel/entry_point.py b/IPython/zmq/parallel/entry_point.py index 2d44e9f..192f4b2 100644 --- a/IPython/zmq/parallel/entry_point.py +++ b/IPython/zmq/parallel/entry_point.py @@ -7,14 +7,14 @@ 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: diff --git a/IPython/zmq/parallel/factory.py b/IPython/zmq/parallel/factory.py index 33287f4..984265a 100644 --- a/IPython/zmq/parallel/factory.py +++ b/IPython/zmq/parallel/factory.py @@ -12,19 +12,18 @@ #----------------------------------------------------------------------------- -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 diff --git a/IPython/zmq/parallel/heartmonitor.py b/IPython/zmq/parallel/heartmonitor.py index 436e7f7..9014819 100644 --- a/IPython/zmq/parallel/heartmonitor.py +++ b/IPython/zmq/parallel/heartmonitor.py @@ -6,8 +6,8 @@ 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 diff --git a/IPython/zmq/parallel/hub.py b/IPython/zmq/parallel/hub.py index a9b5179..1c5b9ec 100755 --- a/IPython/zmq/parallel/hub.py +++ b/IPython/zmq/parallel/hub.py @@ -15,10 +15,10 @@ 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 @@ 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: diff --git a/IPython/zmq/parallel/ipcluster.py b/IPython/zmq/parallel/ipcluster.py index fb078fa..20dfcf6 100644 --- a/IPython/zmq/parallel/ipcluster.py +++ b/IPython/zmq/parallel/ipcluster.py @@ -1,6 +1,8 @@ #!/usr/bin/env python from __future__ import print_function -import sys,os + +import os +import sys import time from subprocess import Popen, PIPE diff --git a/IPython/zmq/parallel/ipclusterapp.py b/IPython/zmq/parallel/ipclusterapp.py index 658c9bc..e73eb1f 100755 --- a/IPython/zmq/parallel/ipclusterapp.py +++ b/IPython/zmq/parallel/ipclusterapp.py @@ -15,12 +15,11 @@ 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 diff --git a/IPython/zmq/parallel/ipcontrollerapp.py b/IPython/zmq/parallel/ipcontrollerapp.py index 4ce8eb3..1f49da7 100755 --- a/IPython/zmq/parallel/ipcontrollerapp.py +++ b/IPython/zmq/parallel/ipcontrollerapp.py @@ -18,12 +18,11 @@ 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 diff --git a/IPython/zmq/parallel/ipengineapp.py b/IPython/zmq/parallel/ipengineapp.py index 9521dbb..17b17c1 100755 --- a/IPython/zmq/parallel/ipengineapp.py +++ b/IPython/zmq/parallel/ipengineapp.py @@ -15,9 +15,9 @@ The IPython engine application # Imports #----------------------------------------------------------------------------- +import json import os import sys -import json import zmq from zmq.eventloop import ioloop diff --git a/IPython/zmq/parallel/launcher.py b/IPython/zmq/parallel/launcher.py index 5189706..01b2f90 100644 --- a/IPython/zmq/parallel/launcher.py +++ b/IPython/zmq/parallel/launcher.py @@ -15,10 +15,10 @@ Facilities for launching IPython processes asynchronously. # Imports #----------------------------------------------------------------------------- +import logging import os import re import sys -import logging from signal import SIGINT, SIGTERM try: diff --git a/IPython/zmq/parallel/logwatcher.py b/IPython/zmq/parallel/logwatcher.py index 5fc506f..7f707cd 100644 --- a/IPython/zmq/parallel/logwatcher.py +++ b/IPython/zmq/parallel/logwatcher.py @@ -13,11 +13,12 @@ #----------------------------------------------------------------------------- -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 diff --git a/IPython/zmq/parallel/mongodb.py b/IPython/zmq/parallel/mongodb.py index 2c8732d..12bf11f 100644 --- a/IPython/zmq/parallel/mongodb.py +++ b/IPython/zmq/parallel/mongodb.py @@ -11,9 +11,11 @@ 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 @@ 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 diff --git a/IPython/zmq/parallel/scheduler.py b/IPython/zmq/parallel/scheduler.py index 80b602a..00e13a0 100644 --- a/IPython/zmq/parallel/scheduler.py +++ b/IPython/zmq/parallel/scheduler.py @@ -10,11 +10,14 @@ 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 @@ 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 diff --git a/IPython/zmq/parallel/streamkernel.py b/IPython/zmq/parallel/streamkernel.py index 0455ed3..81d9f7a 100755 --- a/IPython/zmq/parallel/streamkernel.py +++ b/IPython/zmq/parallel/streamkernel.py @@ -10,15 +10,17 @@ 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 @@ 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__) diff --git a/IPython/zmq/parallel/streamsession.py b/IPython/zmq/parallel/streamsession.py index 7da88d4..ae4e283 100644 --- a/IPython/zmq/parallel/streamsession.py +++ b/IPython/zmq/parallel/streamsession.py @@ -4,12 +4,19 @@ 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 @@ 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'):