Skip to content

Commit 6139efc

Browse files
committed
Imported packages sequencing and formatting 2
1 parent 3211fca commit 6139efc

File tree

13 files changed

+22
-25
lines changed

13 files changed

+22
-25
lines changed

src/messagetypes/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22
from importlib import import_module
3-
from os import path, listdir
3+
from os import listdir, path
44
from string import lower
55

66
import messagetypes

src/network/announcethread.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import time
55

66
import state
7-
87
from bmconfigparser import BMConfigParser
98
from network.assemble import assemble_addr
109
from network.connectionpool import BMConnectionPool

src/network/bmproto.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from inventory import Inventory
2020
from network.advanceddispatcher import AdvancedDispatcher
2121
from network.bmobject import (
22-
BMObject, BMObjectInsufficientPOWError, BMObjectInvalidDataError,
23-
BMObjectExpiredError, BMObjectUnwantedStreamError,
24-
BMObjectInvalidError, BMObjectAlreadyHaveError
22+
BMObject, BMObjectAlreadyHaveError, BMObjectExpiredError,
23+
BMObjectInsufficientPOWError, BMObjectInvalidDataError,
24+
BMObjectInvalidError, BMObjectUnwantedStreamError
2525
)
2626
from network.constants import (
2727
ADDRESS_ALIVE, MAX_MESSAGE_SIZE, MAX_OBJECT_COUNT,
@@ -30,8 +30,8 @@
3030
from network.dandelion import Dandelion
3131
from network.proxy import ProxyError
3232
from node import Node, Peer
33-
from objectracker import missingObjects, ObjectTracker
34-
from queues import objectProcessorQueue, portCheckerQueue, invQueue, addrQueue
33+
from objectracker import ObjectTracker, missingObjects
34+
from queues import addrQueue, invQueue, objectProcessorQueue, portCheckerQueue
3535
from randomtrackingdict import RandomTrackingDict
3636

3737
logger = logging.getLogger('default')

src/network/receivequeuethread.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import socket
77

88
import state
9-
from network.connectionpool import BMConnectionPool
109
from network.advanceddispatcher import UnknownStateError
10+
from network.connectionpool import BMConnectionPool
1111
from queues import receiveDataQueue
1212
from threads import StoppableThread
1313

src/network/socks4a.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import socket
66
import struct
77

8-
from proxy import Proxy, ProxyError, GeneralProxyError
8+
from proxy import GeneralProxyError, Proxy, ProxyError
99

1010

1111
class Socks4aError(ProxyError):

src/network/tls.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import ssl
88
import sys
99

10-
from network.advanceddispatcher import AdvancedDispatcher
1110
import network.asyncore_pollchoose as asyncore
12-
13-
from queues import receiveDataQueue
1411
import paths
12+
from network.advanceddispatcher import AdvancedDispatcher
13+
from queues import receiveDataQueue
1514

1615
logger = logging.getLogger('default')
1716

src/plugins/menu_qrcode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import urllib
77

88
import qrcode
9-
from PyQt4 import QtGui, QtCore
9+
from PyQt4 import QtCore, QtGui
1010

1111
from pybitmessage.tr import _translate
1212

src/plugins/proxyconfig_stem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* otherwise use stem's 'BEST' version and save onion keys to the new
1212
section using *onionhostname* as name for future use.
1313
"""
14-
import os
1514
import logging
15+
import os
1616
import random # noseq
1717
import tempfile
1818

src/plugins/sound_canberra.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
Sound theme plugin using pycanberra
44
"""
55

6-
from pybitmessage.bitmessageqt import sound
7-
86
import pycanberra
7+
from pybitmessage.bitmessageqt import sound
98

109
_canberra = pycanberra.Canberra()
1110

src/pyelliptic/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
This is an abandoned package maintained inside of the PyBitmessage.
1010
"""
1111

12-
from .openssl import OpenSSL
12+
from .cipher import Cipher
1313
from .ecc import ECC
1414
from .eccblind import ECCBlind
15-
from .cipher import Cipher
1615
from .hash import hmac_sha256, hmac_sha512, pbkdf2
16+
from .openssl import OpenSSL
1717

1818
__version__ = '1.3'
1919

0 commit comments

Comments
 (0)