Skip to content

Commit 4832fc0

Browse files
committed
sort the import order
1 parent 7b82cab commit 4832fc0

File tree

5 files changed

+29
-40
lines changed

5 files changed

+29
-40
lines changed

thriftpy2/_compat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import platform
1313
import sys
14-
from urllib.request import urlopen
1514
from urllib.parse import urlparse
15+
from urllib.request import urlopen
1616

1717
PY3 = sys.version_info[0] == 3
1818
PY35 = sys.version_info >= (3, 5)

thriftpy2/contrib/aio/rpc.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# -*- coding: utf-8 -*-
2-
import warnings
32
import urllib
3+
import warnings
44

5-
from .processor import TAsyncProcessor
65
from .client import TAsyncClient
6+
from .processor import TAsyncProcessor
77
from .protocol.binary import TAsyncBinaryProtocolFactory
8-
from .transport.buffered import TAsyncBufferedTransportFactory
9-
from .socket import TAsyncSocket, TAsyncServerSocket
108
from .server import TAsyncServer
9+
from .socket import TAsyncServerSocket, TAsyncSocket
10+
from .transport.buffered import TAsyncBufferedTransportFactory
1111

1212

1313
async def make_client(service, host='localhost', port=9090, unix_socket=None,

thriftpy2/http.py

+7-10
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,20 @@
3232

3333
from __future__ import absolute_import
3434

35+
import http.client as http_client
36+
import http.server as http_server
3537
import os
3638
import socket
3739
import sys
40+
import urllib
3841
from contextlib import contextmanager
3942
from io import BytesIO
4043

41-
import http.client as http_client
42-
import http.server as http_server
43-
import urllib
44-
45-
from thriftpy2.thrift import TProcessor, TClient
46-
from thriftpy2.server import TServer
47-
from thriftpy2.transport import TTransportBase, TMemoryBuffer
48-
4944
from thriftpy2.protocol import TBinaryProtocolFactory
50-
from thriftpy2.transport import TBufferedTransportFactory
51-
45+
from thriftpy2.server import TServer
46+
from thriftpy2.thrift import TClient, TProcessor
47+
from thriftpy2.transport import (TBufferedTransportFactory, TMemoryBuffer,
48+
TTransportBase)
5249

5350
HTTP_URI = '{scheme}://{host}:{port}{path}'
5451
DEFAULT_HTTP_CLIENT_TIMEOUT_MS = 30000 # 30 seconds

thriftpy2/rpc.py

+7-14
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,15 @@
44

55
import contextlib
66
import socket
7+
import urllib
78
import warnings
89

910
from thriftpy2._compat import PY35
10-
import urllib
11-
1211
from thriftpy2.protocol import TBinaryProtocolFactory
1312
from thriftpy2.server import TThreadedServer
14-
from thriftpy2.thrift import TProcessor, TClient
15-
from thriftpy2.transport import (
16-
TBufferedTransportFactory,
17-
TServerSocket,
18-
TSSLServerSocket,
19-
TSocket,
20-
TSSLSocket,
21-
)
13+
from thriftpy2.thrift import TClient, TProcessor
14+
from thriftpy2.transport import (TBufferedTransportFactory, TServerSocket,
15+
TSocket, TSSLServerSocket, TSSLSocket)
2216

2317

2418
def make_client(service, host="localhost", port=9090, unix_socket=None,
@@ -131,7 +125,6 @@ def client_context(service, host="localhost", port=9090, unix_socket=None,
131125

132126

133127
if PY35:
134-
from thriftpy2.contrib.aio.rpc import ( # noqa
135-
make_server as make_aio_server,
136-
make_client as make_aio_client
137-
)
128+
from thriftpy2.contrib.aio.rpc import make_client as make_aio_client
129+
from thriftpy2.contrib.aio.rpc import \
130+
make_server as make_aio_server # noqa

thriftpy2/tornado.py

+10-11
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,22 @@
1717

1818
from __future__ import absolute_import
1919

20+
import logging
21+
import socket
22+
import struct
23+
import urllib
2024
from contextlib import contextmanager
21-
from tornado import tcpserver, iostream, gen
22-
from tornado import version as tornado_version
23-
from io import BytesIO
2425
from datetime import timedelta
26+
from io import BytesIO
2527

26-
from .transport import TTransportException, TTransportBase
27-
from .transport.memory import TMemoryBuffer
28-
from .thrift import TApplicationException, TProcessor, TClient
28+
from tornado import gen, iostream, tcpserver
29+
from tornado import version as tornado_version
2930

3031
# TODO need TCyTornadoStreamTransport to work with cython binary protocol
3132
from .protocol.binary import TBinaryProtocolFactory
32-
33-
import urllib
34-
import logging
35-
import socket
36-
import struct
33+
from .thrift import TApplicationException, TClient, TProcessor
34+
from .transport import TTransportBase, TTransportException
35+
from .transport.memory import TMemoryBuffer
3736

3837
try:
3938
from tornado.locks import Lock

0 commit comments

Comments
 (0)