Skip to content

Commit 6f35da4

Browse files
committed
Imported packages sequencing and formatting
1 parent 6139efc commit 6f35da4

24 files changed

+66
-70
lines changed

src/addresses.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from debug import logger
1010

11-
1211
ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
1312

1413

src/api.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
1919
from struct import pack
2020

21-
from version import softwareVersion
22-
2321
import defaults
2422
import helper_inbox
2523
import helper_sent
@@ -42,6 +40,7 @@
4240
from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery, sqlStoredProcedure
4341
from inventory import Inventory
4442
from network.threads import StoppableThread
43+
from version import softwareVersion
4544

4645
str_chan = '[chan]'
4746

src/bitmessagecli.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
1414
"""
1515

16-
import xmlrpclib
1716
import datetime
1817
import imghdr
19-
import ntpath
2018
import json
19+
import ntpath
20+
import os
2121
import socket
22-
import time
2322
import sys
24-
import os
23+
import time
24+
import xmlrpclib
2525

2626
from bmconfigparser import BMConfigParser
2727

src/bitmessagemain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333

3434
import defaults
3535
import shared
36-
import state
3736
import shutdown
37+
import state
3838
from bmconfigparser import BMConfigParser
3939
from debug import logger # this should go before any threads
4040
from helper_startup import (

src/bmconfigparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"""
44

55
import ConfigParser
6-
import shutil
76
import os
7+
import shutil
88
from datetime import datetime
99

1010
import state

src/build_osx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Building osx."""
2-
from glob import glob
32
import os
3+
from glob import glob
44
from PyQt4 import QtCore
55
from setuptools import setup
66

src/class_addressGenerator.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
"""
22
A thread for creating addresses
33
"""
4-
import time
54
import hashlib
5+
import time
66
from binascii import hexlify
7-
from pyelliptic import arithmetic
8-
from pyelliptic.openssl import OpenSSL
97

10-
import tr
11-
import queues
12-
import state
13-
import shared
148
import defaults
159
import highlevelcrypto
16-
from bmconfigparser import BMConfigParser
10+
import queues
11+
import shared
12+
import state
13+
import tr
1714
from addresses import decodeAddress, encodeAddress, encodeVarint
15+
from bmconfigparser import BMConfigParser
1816
from fallback import RIPEMD160Hash
1917
from network import StoppableThread
18+
from pyelliptic import arithmetic
19+
from pyelliptic.openssl import OpenSSL
2020

2121

2222
class addressGenerator(StoppableThread):

src/class_objectProcessor.py

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,29 @@
1212
from binascii import hexlify
1313
from subprocess import call # nosec
1414

15-
import highlevelcrypto
16-
import knownnodes
17-
import shared
18-
from addresses import (
19-
calculateInventoryHash, decodeAddress, decodeVarint, encodeAddress,
20-
encodeVarint, varintDecodeError
21-
)
22-
from bmconfigparser import BMConfigParser
23-
2415
import helper_bitcoin
2516
import helper_inbox
2617
import helper_msgcoding
2718
import helper_sent
28-
from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery
29-
from helper_ackPayload import genAckPayload
30-
from network import bmproto
31-
from network.node import Peer
32-
19+
import highlevelcrypto
20+
import knownnodes
21+
import l10n
3322
import protocol
3423
import queues
24+
import shared
3525
import state
3626
import tr
27+
from addresses import (
28+
calculateInventoryHash, decodeAddress, decodeVarint,
29+
encodeAddress, encodeVarint, varintDecodeError
30+
)
31+
from bmconfigparser import BMConfigParser
3732
from fallback import RIPEMD160Hash
38-
39-
import l10n
33+
from helper_ackPayload import genAckPayload
34+
from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery
35+
from network import bmproto
36+
from network.node import Peer
37+
# pylint: disable=too-many-locals, too-many-return-statements, too-many-branches, too-many-statements
4038

4139
logger = logging.getLogger('default')
4240

src/class_singleCleaner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import state
3030
import tr
3131
from bmconfigparser import BMConfigParser
32-
from helper_sql import sqlQuery, sqlExecute
32+
from helper_sql import sqlExecute, sqlQuery
3333
from inventory import Inventory
3434
from network import BMConnectionPool, StoppableThread
3535

src/class_sqlThread.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22
sqlThread is defined here
33
"""
44

5-
import threading
6-
from bmconfigparser import BMConfigParser
7-
8-
import sqlite3
9-
import time
5+
import os
106
import shutil # used for moving the messages.dat file
7+
import sqlite3
118
import sys
12-
import os
13-
from debug import logger
9+
import threading
10+
import time
1411

1512
import helper_sql
1613
import helper_startup
1714
import paths
1815
import queues
1916
import state
2017
import tr
18+
from bmconfigparser import BMConfigParser
19+
from debug import logger
2120
# pylint: disable=attribute-defined-outside-init,protected-access
2221

2322

0 commit comments

Comments
 (0)