Skip to content

Commit

Permalink
Format with isort
Browse files Browse the repository at this point in the history
  • Loading branch information
johannaengland committed Jul 28, 2023
1 parent e5ff2db commit 3bc9e39
Show file tree
Hide file tree
Showing 15 changed files with 68 additions and 52 deletions.
3 changes: 2 additions & 1 deletion examples/auth.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from ritz import ritz, parse_tcl_config
import argparse

from ritz import parse_tcl_config, ritz


def main():
parser = argparse.ArgumentParser(description="Process some integers.")
Expand Down
7 changes: 4 additions & 3 deletions examples/host_up_cleanup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import logging
import re
import sys
import os
import re
import socket
from ritz import ritz, caseType, caseState
import sys
import traceback

from ritz import caseState, caseType, ritz


def main():
"""
Expand Down
8 changes: 4 additions & 4 deletions examples/monitor.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from ritz import ritz, notifier, parse_tcl_config, caseType
from pprint import pprint
from time import sleep
import argparse
import sys
import logging
from pprint import pprint
import sys
from time import sleep

from ritz import caseType, notifier, parse_tcl_config, ritz

cases = {}

Expand Down
3 changes: 2 additions & 1 deletion examples/pm-add.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from ritz import ritz, parse_tcl_config
import argparse
from datetime import datetime, timedelta
import logging

from ritz import parse_tcl_config, ritz


def main():
parser = argparse.ArgumentParser(description="Process some integers.")
Expand Down
5 changes: 3 additions & 2 deletions examples/pm-test.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from ritz import ritz, parse_tcl_config
from pprint import pprint
import argparse
from datetime import datetime, timedelta
import logging
from pprint import pprint

from ritz import parse_tcl_config, ritz


def main():
Expand Down
7 changes: 4 additions & 3 deletions examples/pm-test2.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from ritz import ritz, parse_tcl_config
from os.path import expanduser
import re
import argparse
from datetime import datetime, timedelta
from os.path import expanduser
import re

from ritz import parse_tcl_config, ritz


def importconf(file):
Expand Down
7 changes: 4 additions & 3 deletions examples/reboot.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import subprocess
from datetime import datetime, timedelta
import os
import re
import subprocess
import sys
import os

from ritz import ritz
from datetime import datetime, timedelta


def main():
Expand Down
5 changes: 3 additions & 2 deletions examples/schedule_reboot_host.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from datetime import datetime, timedelta
import logging
import sys
import os
import socket
import sys

from ritz import ritz
from datetime import datetime, timedelta


def main():
Expand Down
9 changes: 5 additions & 4 deletions examples/test-with.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from ritz import ritz, notifier, parse_tcl_config
from pprint import pprint
import argparse
from os.path import expanduser
from time import sleep
from pprint import pprint
import re
import argparse
import sys
from time import sleep

from ritz import notifier, parse_tcl_config, ritz


def importconf(file):
Expand Down
9 changes: 5 additions & 4 deletions examples/test.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import argparse
import logging
from ritz import ritz, notifier, parse_tcl_config
from pprint import pprint
from os.path import expanduser
from time import sleep
from pprint import pprint
import re
import argparse
import sys
from time import sleep

from ritz import notifier, parse_tcl_config, ritz


def importconf(file):
Expand Down
16 changes: 12 additions & 4 deletions src/zinolib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@

from .ritz import ritz, notifier, parse_tcl_config
from .ritz import caseState, caseType, Case
from .ritz import AuthenticationError, NotConnectedError, ProtocolError
from .ritz import (
AuthenticationError,
Case,
NotConnectedError,
ProtocolError,
caseState,
caseType,
notifier,
parse_tcl_config,
ritz,
)

__all__ = [
"ritz",
Expand All @@ -24,7 +32,7 @@
package_name = "PyRitz"
__version__ = "master" # fallback
try:
from importlib.metadata import version, PackageNotFoundError
from importlib.metadata import PackageNotFoundError, version
except ImportError: # Python < 3.8
try:
import pkg_resources # type: ignore
Expand Down
19 changes: 9 additions & 10 deletions src/zinolib/ritz.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,22 @@
version doVersionCmd $chan $l
"""

import logging
import socket
import hashlib
import enum
import ipaddress
import codecs
from datetime import datetime, timedelta
import enum
import errno
from time import mktime
import re
import hashlib
import ipaddress
import logging
from os.path import expanduser
from typing import NamedTuple
import codecs
import re
import select
import socket
from time import mktime
from typing import NamedTuple

from .utils import windows_codepage_cp1252


codecs.register_error("windows_codepage_cp1252", windows_codepage_cp1252)
logger = logging.getLogger(__name__)
logger.setLevel(logging.ERROR)
Expand Down
6 changes: 3 additions & 3 deletions src/zinolib/zino_emu.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env python3
import os
import socket
import sys
import threading
import traceback
from time import sleep
import traceback
from typing import Callable, Dict, List, Union
import sys
import os

if "emudebug" in os.environ:
debug = 1
Expand Down
9 changes: 5 additions & 4 deletions tests/atest_mock.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from ritz import ritz, ProtocolError, AuthenticationError, caseState, caseType
from ritz.zino_emu import zinoemu
import logging
import datetime
import unittest
from ipaddress import ip_address
import logging
import unittest
import unittest.mock

from ritz import AuthenticationError, ProtocolError, caseState, caseType, ritz
from ritz.zino_emu import zinoemu

ritzlog = logging.getLogger("ritz")
ritzlog.setLevel(logging.DEBUG)
ritzlog.addHandler(logging.FileHandler("test1.log"))
Expand Down
7 changes: 3 additions & 4 deletions tests/test_default.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import logging
import datetime
from ipaddress import ip_address
import logging
import os
import time
import unittest
from ipaddress import ip_address

from zinolib.ritz import ritz, ProtocolError, AuthenticationError, caseState, caseType
from zinolib.ritz import AuthenticationError, ProtocolError, caseState, caseType, ritz
from zinolib.zino_emu import zinoemu


ritzlog = logging.getLogger("ritz")
ritzlog.setLevel(logging.DEBUG)
ritzlog.addHandler(logging.FileHandler("test1.log"))
Expand Down

0 comments on commit 3bc9e39

Please sign in to comment.