[ovs-dev] [PATCH] Adapt to flake8-import-order
xurong00037997
xu.rong at zte.com.cn
Fri Feb 24 02:03:26 UTC 2017
https://review.openstack.org/#/c/432906/
flake8-import-order adds 3 new flake8 warnings:
I100: Your import statements are in the wrong order.
I101: The names in your from import are in the wrong order.
I201: Missing newline between sections or imports.
---
python/ovs/db/data.py | 13 ++++++-------
python/ovs/db/idl.py | 8 ++++----
python/ovs/db/parser.py | 4 ++--
python/ovs/db/schema.py | 6 +++---
python/ovs/db/types.py | 8 ++++----
python/ovs/fcntl_win.py | 8 ++++++--
python/ovs/json.py | 1 +
python/ovs/jsonrpc.py | 4 ++--
python/ovs/ovsuuid.py | 6 +++---
python/ovs/poller.py | 8 +++++---
python/ovs/reconnect.py | 2 +-
python/ovs/socket_util.py | 6 +++---
python/ovs/stream.py | 4 ++--
python/ovs/unixctl/__init__.py | 3 ++-
python/ovs/unixctl/client.py | 3 +--
python/ovs/unixctl/server.py | 6 +++---
python/ovs/vlog.py | 6 +++---
python/ovs/winutils.py | 11 ++++++-----
python/ovstest/rpcserver.py | 11 ++++++++---
python/ovstest/tcp.py | 6 ++++--
python/ovstest/util.py | 10 ++++++----
python/setup.py | 1 +
tests/test-json.py | 1 +
tests/test-ovsdb.py | 7 ++++---
tests/test-vlog.py | 1 +
utilities/bugtool/ovs-bugtool.in | 22 ++++++++++++----------
utilities/ovs-tcpdump.in | 4 +++-
vtep/ovs-vtep | 7 ++++---
.../usr_share_openvswitch_scripts_ovs-xapi-sync | 3 ++-
29 files changed, 103 insertions(+), 77 deletions(-)
diff --git a/python/ovs/db/data.py b/python/ovs/db/data.py
index 98084ac..9e57595 100644
--- a/python/ovs/db/data.py
+++ b/python/ovs/db/data.py
@@ -16,17 +16,16 @@ import functools
import re
import uuid
-import six
-
-import ovs.poller
-import ovs.socket_util
+import ovs.db.parser
+import ovs.db.types
import ovs.json
import ovs.jsonrpc
import ovs.ovsuuid
-
-import ovs.db.parser
+import ovs.poller
+import ovs.socket_util
from ovs.db import error
-import ovs.db.types
+
+import six
class ConstraintViolation(error.Error):
diff --git a/python/ovs/db/idl.py b/python/ovs/db/idl.py
index b7b5e1c..079a03b 100644
--- a/python/ovs/db/idl.py
+++ b/python/ovs/db/idl.py
@@ -15,16 +15,16 @@
import functools
import uuid
-import six
-
-import ovs.jsonrpc
import ovs.db.data as data
import ovs.db.parser
import ovs.db.schema
-from ovs.db import error
+import ovs.jsonrpc
import ovs.ovsuuid
import ovs.poller
import ovs.vlog
+from ovs.db import error
+
+import six
vlog = ovs.vlog.Vlog("idl")
diff --git a/python/ovs/db/parser.py b/python/ovs/db/parser.py
index 0d337d2..b39de39 100644
--- a/python/ovs/db/parser.py
+++ b/python/ovs/db/parser.py
@@ -14,10 +14,10 @@
import re
-import six
-
from ovs.db import error
+import six
+
class Parser(object):
def __init__(self, json, name):
diff --git a/python/ovs/db/schema.py b/python/ovs/db/schema.py
index 8917e5d..b68c19e 100644
--- a/python/ovs/db/schema.py
+++ b/python/ovs/db/schema.py
@@ -15,11 +15,11 @@
import re
import sys
-import six
-
-from ovs.db import error
import ovs.db.parser
import ovs.db.types
+from ovs.db import error
+
+import six
def _check_id(name, json):
diff --git a/python/ovs/db/types.py b/python/ovs/db/types.py
index 50eb505..7523b20 100644
--- a/python/ovs/db/types.py
+++ b/python/ovs/db/types.py
@@ -15,12 +15,12 @@
import sys
import uuid
-import six
-
-from ovs.db import error
-import ovs.db.parser
import ovs.db.data
+import ovs.db.parser
import ovs.ovsuuid
+from ovs.db import error
+
+import six
class AtomicType(object):
diff --git a/python/ovs/fcntl_win.py b/python/ovs/fcntl_win.py
index 24e6c54..a0ae970 100644
--- a/python/ovs/fcntl_win.py
+++ b/python/ovs/fcntl_win.py
@@ -13,10 +13,14 @@
# limitations under the License.
import errno
+
+import msvcrt
+
+import pywintypes
+
import win32con
+
import win32file
-import pywintypes
-import msvcrt
LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
LOCK_SH = 0 # the default
diff --git a/python/ovs/json.py b/python/ovs/json.py
index ddf5dd2..37ea9cf 100644
--- a/python/ovs/json.py
+++ b/python/ovs/json.py
@@ -13,6 +13,7 @@
# limitations under the License.
from __future__ import absolute_import
+
import functools
import json
import re
diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index 5a11500..69f7abe 100644
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -16,8 +16,6 @@ import errno
import os
import sys
-import six
-
import ovs.json
import ovs.poller
import ovs.reconnect
@@ -26,6 +24,8 @@ import ovs.timeval
import ovs.util
import ovs.vlog
+import six
+
EOF = ovs.util.EOF
vlog = ovs.vlog.Vlog("jsonrpc")
diff --git a/python/ovs/ovsuuid.py b/python/ovs/ovsuuid.py
index a9774ae..35c5bd2 100644
--- a/python/ovs/ovsuuid.py
+++ b/python/ovs/ovsuuid.py
@@ -15,12 +15,12 @@
import re
import uuid
+import ovs.db.parser
+from ovs.db import error
+
import six
from six.moves import range
-from ovs.db import error
-import ovs.db.parser
-
uuidRE = re.compile("^xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx$"
.replace('x', '[0-9a-fA-F]'))
diff --git a/python/ovs/poller.py b/python/ovs/poller.py
index d836483..809e512 100644
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -13,13 +13,15 @@
# limitations under the License.
import errno
-import ovs.timeval
-import ovs.vlog
+import os
+
import select
import socket
-import os
import sys
+import ovs.timeval
+import ovs.vlog
+
if sys.platform == "win32":
import ovs.winutils as winutils
diff --git a/python/ovs/reconnect.py b/python/ovs/reconnect.py
index d4f5951..ec52ebb 100644
--- a/python/ovs/reconnect.py
+++ b/python/ovs/reconnect.py
@@ -14,8 +14,8 @@
import os
-import ovs.vlog
import ovs.util
+import ovs.vlog
# Values returned by Reconnect.run()
CONNECT = 'connect'
diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index fb6cee4..4031049 100644
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -19,13 +19,13 @@ import random
import socket
import sys
-import six
-from six.moves import range
-
import ovs.fatal_signal
import ovs.poller
import ovs.vlog
+import six
+from six.moves import range
+
if sys.platform == 'win32':
import ovs.winutils as winutils
import win32file
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index be69534..fc0368c 100644
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -17,12 +17,12 @@ import os
import socket
import sys
-import six
-
import ovs.poller
import ovs.socket_util
import ovs.vlog
+import six
+
try:
from OpenSSL import SSL
except ImportError:
diff --git a/python/ovs/unixctl/__init__.py b/python/ovs/unixctl/__init__.py
index a2b13f9..025da2a 100644
--- a/python/ovs/unixctl/__init__.py
+++ b/python/ovs/unixctl/__init__.py
@@ -12,11 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import six
import sys
import ovs.util
+import six
+
commands = {}
strtypes = six.string_types
diff --git a/python/ovs/unixctl/client.py b/python/ovs/unixctl/client.py
index 1b247c4..e07b038 100644
--- a/python/ovs/unixctl/client.py
+++ b/python/ovs/unixctl/client.py
@@ -14,12 +14,11 @@
import os
-import six
-
import ovs.jsonrpc
import ovs.stream
import ovs.util
+import six
vlog = ovs.vlog.Vlog("unixctl_client")
strtypes = six.string_types
diff --git a/python/ovs/unixctl/server.py b/python/ovs/unixctl/server.py
index 3f3e051..d5fb080 100644
--- a/python/ovs/unixctl/server.py
+++ b/python/ovs/unixctl/server.py
@@ -17,9 +17,6 @@ import errno
import os
import sys
-import six
-from six.moves import range
-
import ovs.dirs
import ovs.jsonrpc
import ovs.stream
@@ -28,6 +25,9 @@ import ovs.util
import ovs.version
import ovs.vlog
+import six
+from six.moves import range
+
Message = ovs.jsonrpc.Message
vlog = ovs.vlog.Vlog("unixctl_server")
strtypes = six.string_types
diff --git a/python/ovs/vlog.py b/python/ovs/vlog.py
index 99bd36b..d7a84d8 100644
--- a/python/ovs/vlog.py
+++ b/python/ovs/vlog.py
@@ -22,13 +22,13 @@ import socket
import sys
import threading
-import six
-from six.moves import range
-
import ovs.dirs
import ovs.unixctl
import ovs.util
+import six
+from six.moves import range
+
DESTINATIONS = {"console": "info", "file": "info", "syslog": "info"}
PATTERNS = {
"console": "%D{%Y-%m-%dT%H:%M:%SZ}|%05N|%c%T|%p|%m",
diff --git a/python/ovs/winutils.py b/python/ovs/winutils.py
index 3a235f8..a3627ff 100644
--- a/python/ovs/winutils.py
+++ b/python/ovs/winutils.py
@@ -12,19 +12,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import six
import sys
+import six
+
if sys.platform != 'win32':
raise Exception("Intended to use only on Windows")
else:
import pywintypes
- import winerror
- import win32pipe
import win32con
- import win32security
- import win32file
import win32event
+ import win32file
+ import win32pipe
+ import win32security
+ import winerror
def close_handle(handle, logger=None):
diff --git a/python/ovstest/rpcserver.py b/python/ovstest/rpcserver.py
index 7abf13c..ca473e0 100644
--- a/python/ovstest/rpcserver.py
+++ b/python/ovstest/rpcserver.py
@@ -18,18 +18,23 @@ rpcserver is an XML RPC server that allows RPC client to initiate tests
from __future__ import print_function
-import exceptions
import sys
+import exceptions
+
import six.moves.xmlrpc_client
+
+import tcp
+
from twisted.internet import reactor
from twisted.internet.error import CannotListenError
-from twisted.web import xmlrpc
from twisted.web import server
+from twisted.web import xmlrpc
-import tcp
import udp
+
import util
+
import vswitch
diff --git a/python/ovstest/tcp.py b/python/ovstest/tcp.py
index d1304c3..c495717 100644
--- a/python/ovstest/tcp.py
+++ b/python/ovstest/tcp.py
@@ -16,10 +16,12 @@
tcp module contains listener and sender classes for TCP protocol
"""
-from twisted.internet.protocol import Factory, ClientFactory, Protocol
+import time
+
from twisted.internet import interfaces
+from twisted.internet.protocol import ClientFactory, Factory, Protocol
+
from zope.interface import implements
-import time
class TcpListenerConnection(Protocol):
diff --git a/python/ovstest/util.py b/python/ovstest/util.py
index 830feba..839c9e7 100644
--- a/python/ovstest/util.py
+++ b/python/ovstest/util.py
@@ -16,18 +16,20 @@
util module contains some helper function
"""
import array
-import exceptions
import fcntl
+
import os
+import re
import select
+import signal
import socket
import struct
-import signal
import subprocess
-import re
-from six.moves import range
+import exceptions
+
import six.moves.xmlrpc_client
+from six.moves import range
def str_ip(ip_address):
diff --git a/python/setup.py b/python/setup.py
index 19c1f18..4889a69 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -11,6 +11,7 @@
# limitations under the License.
from __future__ import print_function
+
import sys
from distutils.command.build_ext import build_ext
diff --git a/tests/test-json.py b/tests/test-json.py
index 3f0b966..582aa72 100644
--- a/tests/test-json.py
+++ b/tests/test-json.py
@@ -19,6 +19,7 @@ import getopt
import sys
import ovs.json
+
import six
diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py
index dced56b..4dcc91e 100644
--- a/tests/test-ovsdb.py
+++ b/tests/test-ovsdb.py
@@ -15,21 +15,22 @@
from __future__ import print_function
import getopt
-import re
import os
+import re
import sys
import uuid
-from ovs.db import error
import ovs.db.idl
import ovs.db.schema
-from ovs.db import data
import ovs.db.types
import ovs.ovsuuid
import ovs.poller
import ovs.stream
import ovs.util
+from ovs.db import data
+from ovs.db import error
from ovs.fatal_signal import signal_alarm
+
import six
diff --git a/tests/test-vlog.py b/tests/test-vlog.py
index ecfa26f..d711e0b 100644
--- a/tests/test-vlog.py
+++ b/tests/test-vlog.py
@@ -15,6 +15,7 @@
import argparse
import ovs.vlog
+
from six.moves import range
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index 963c50c..506e428 100755
--- a/utilities/bugtool/ovs-bugtool.in
+++ b/utilities/bugtool/ovs-bugtool.in
@@ -34,25 +34,27 @@
#
from __future__ import print_function
-from six.moves import input
+import StringIO
+import commands
+import fcntl
import getopt
-import re
+import hashlib
import os
-import StringIO
+import platform
+import re
import sys
import tarfile
import time
-import commands
-from xml.dom.minidom import parse, getDOMImplementation
+import warnings
import zipfile
-from subprocess import Popen, PIPE
from select import select
from signal import SIGTERM
-import hashlib
-import platform
-import fcntl
-import warnings
+from subprocess import PIPE, Popen
+
+from xml.dom.minidom import getDOMImplementation, parse
+
+from six.moves import input
warnings.filterwarnings(action="ignore", category=DeprecationWarning)
OS_RELEASE = platform.release()
diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in
index a6e4ada..5595611 100755
--- a/utilities/ovs-tcpdump.in
+++ b/utilities/ovs-tcpdump.in
@@ -15,7 +15,7 @@
# limitations under the License.
import fcntl
-import netifaces
+
import os
import pwd
import struct
@@ -23,6 +23,8 @@ import subprocess
import sys
import time
+import netifaces
+
try:
from ovs.db import idl
from ovs import jsonrpc
diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep
index fd652d4..5153b3b 100755
--- a/vtep/ovs-vtep
+++ b/vtep/ovs-vtep
@@ -23,13 +23,14 @@ import subprocess
import sys
import time
-import ovs.dirs
-import ovs.util
import ovs.daemon
+import ovs.dirs
import ovs.unixctl.server
+import ovs.util
import ovs.vlog
-from six.moves import range
+
import six
+from six.moves import range
VERSION = "0.99"
diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index a776c00..ecd6f6d 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -29,11 +29,12 @@ import time
import XenAPI
-import ovs.dirs
import ovs.daemon
import ovs.db.idl
+import ovs.dirs
import ovs.unixctl
import ovs.unixctl.server
+
import six
vlog = ovs.vlog.Vlog("ovs-xapi-sync")
--
2.8.1
More information about the dev
mailing list