pass over files using isort

This commit is contained in:
bharnden 2019-09-10 14:20:51 -07:00
parent a004285514
commit d5055f85d3
70 changed files with 260 additions and 307 deletions

View file

@ -3,9 +3,9 @@
# Example CORE Python script that attaches N nodes to an EMANE 802.11abg network.
import datetime
import parser
from builtins import range
import parser
from core import load_logging_config
from core.emane.ieee80211abg import EmaneIeee80211abgModel
from core.emulator.coreemu import CoreEmu

View file

@ -6,13 +6,13 @@
# nodestep
import datetime
import parser
from builtins import range
import parser
from core import load_logging_config
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
load_logging_config()

View file

@ -8,7 +8,7 @@ from builtins import range
from core import load_logging_config
from core.emulator.emudata import IpPrefixes
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
load_logging_config()

View file

@ -6,13 +6,13 @@
# nodestep
import datetime
import parser
from builtins import range
import parser
from core import load_logging_config
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
from core.location.mobility import BasicRangeModel
load_logging_config()

View file

@ -2,8 +2,7 @@ import logging
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)

View file

@ -2,8 +2,7 @@ import logging
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)

View file

@ -2,8 +2,7 @@ import logging
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)

View file

@ -2,8 +2,7 @@ import logging
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)

View file

@ -2,8 +2,7 @@ import logging
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)

View file

@ -2,8 +2,7 @@ import logging
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import NodeTypes, EventTypes
from core.emulator.enumerations import EventTypes, NodeTypes
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)

View file

@ -2,8 +2,7 @@
Example custom emane model.
"""
from core.emane import emanemanifest
from core.emane import emanemodel
from core.emane import emanemanifest, emanemodel
class ExampleModel(emanemodel.EmaneModel):

View file

@ -2,8 +2,7 @@
Simple example for a user-defined service.
"""
from core.services.coreservices import CoreService
from core.services.coreservices import ServiceMode
from core.services.coreservices import CoreService, ServiceMode
class MyService(CoreService):

View file

@ -19,14 +19,16 @@ import core.nodes.base
import core.nodes.network
from core.api.tlv import coreapi, dataconversion
from core.api.tlv.coreapi import CoreExecuteTlv
from core.emulator.enumerations import CORE_API_PORT
from core.emulator.enumerations import EventTlvs
from core.emulator.enumerations import EventTypes
from core.emulator.enumerations import ExecuteTlvs
from core.emulator.enumerations import LinkTlvs
from core.emulator.enumerations import LinkTypes
from core.emulator.enumerations import MessageFlags
from core.emulator.enumerations import MessageTypes
from core.emulator.enumerations import (
CORE_API_PORT,
EventTlvs,
EventTypes,
ExecuteTlvs,
LinkTlvs,
LinkTypes,
MessageFlags,
MessageTypes,
)
from core.emulator.session import Session
from core.nodes import ipaddress

View file

@ -18,7 +18,14 @@ import core.nodes.base
import core.nodes.network
from core import constants
from core.api.tlv import coreapi, dataconversion
from core.emulator.enumerations import CORE_API_PORT, EventTypes, EventTlvs, LinkTlvs, LinkTypes, MessageFlags
from core.emulator.enumerations import (
CORE_API_PORT,
EventTlvs,
EventTypes,
LinkTlvs,
LinkTypes,
MessageFlags,
)
from core.emulator.session import Session
from core.nodes import ipaddress

View file

@ -22,8 +22,8 @@ import time
import core.nodes.base
import core.nodes.network
from core import constants
from core.nodes import ipaddress
from core.emulator.session import Session
from core.nodes import ipaddress
GBD = 1024.0 * 1024.0

View file

@ -47,14 +47,11 @@ from core.emulator.session import Session
from core.nodes import ipaddress
try:
import emaneeventservice
import emaneeventpathloss
except Exception as e:
try:
from emanesh.events import EventService
from emanesh.events import PathlossEvent
except Exception as e2:
raise ImportError("failed to import EMANE Python bindings:\n%s\n%s" % (e, e2))
from emane.events import EventService
from emane.events import PathlossEvent
except ImportError:
from emanesh.events import EventService
from emanesh.events import PathlossEvent
# global Experiment object (for interaction with "python -i")
exp = None

View file

@ -9,7 +9,7 @@ import optparse
import socket
from core.api.tlv import coreapi
from core.emulator.enumerations import MessageFlags, SessionTlvs, CORE_API_PORT
from core.emulator.enumerations import CORE_API_PORT, MessageFlags, SessionTlvs
def main():