Resolve wildcard imports

BM-2cWy7cvHoq3f1rYMerRJp8PT653jjSuEdY
Mar 13 09:50 [raw]

diff --git a/src/addresses.py b/src/addresses.py index c8caaf8..8b7fb32 100644 --- a/src/addresses.py +++ b/src/addresses.py @@ -1,5 +1,5 @@ import hashlib -from struct import * +from struct import pack, unpack from pyelliptic import arithmetic from binascii import hexlify, unhexlify diff --git a/src/bitmessagecurses/__init__.py b/src/bitmessagecurses/__init__.py index fc1d74b..2599bb1 100644 --- a/src/bitmessagecurses/__init__.py +++ b/src/bitmessagecurses/__init__.py @@ -10,7 +10,7 @@ import os import sys import StringIO -from textwrap import * +from textwrap import fill import time from time import strftime, localtime @@ -19,10 +19,10 @@ from threading import Timer import curses import dialog from dialog import Dialog -from helper_sql import * +from helper_sql import sqlExecute, sqlQuery from helper_ackPayload import genAckPayload -from addresses import * +from addresses import addBMIfNotPresent, decodeAddress import ConfigParser from bmconfigparser import BMConfigParser from inventory import Inventory diff --git a/src/bitmessageqt/account.py b/src/bitmessageqt/account.py index 92d497f..a817841 100644 --- a/src/bitmessageqt/account.py +++ b/src/bitmessageqt/account.py @@ -4,7 +4,7 @@ import queues import re import sys import inspect -from helper_sql import * +from helper_sql import sqlExecute, sqlQuery from helper_ackPayload import genAckPayload from addresses import decodeAddress from bmconfigparser import BMConfigParser diff --git a/src/bitmessageqt/foldertree.py b/src/bitmessageqt/foldertree.py index 11227fc..12a55c0 100644 --- a/src/bitmessageqt/foldertree.py +++ b/src/bitmessageqt/foldertree.py @@ -3,8 +3,8 @@ from string import find, rfind, rstrip, lstrip from tr import _translate from bmconfigparser import BMConfigParser -from helper_sql import * -from utils import * +from helper_sql import sqlExecute, sqlQuery +from utils import avatarize from settingsmixin import SettingsMixin # for pylupdate diff --git a/src/bitmessageqt/messageview.py b/src/bitmessageqt/messageview.py index 4d2e768..b6f6474 100644 --- a/src/bitmessageqt/messageview.py +++ b/src/bitmessageqt/messageview.py @@ -3,7 +3,7 @@ from PyQt4 import QtCore, QtGui import multiprocessing import Queue from urlparse import urlparse -from safehtmlparser import * +from safehtmlparser import SafeHTMLParser class MessageView(QtGui.QTextBrowser): MODE_PLAIN = 0 diff --git a/src/bitmessageqt/support.py b/src/bitmessageqt/support.py index 25c6113..a5b2269 100644 --- a/src/bitmessageqt/support.py +++ b/src/bitmessageqt/support.py @@ -9,7 +9,7 @@ from bmconfigparser import BMConfigParser from debug import logger import defaults from foldertree import AccountMixin -from helper_sql import * +from helper_sql import sqlExecute, sqlQuery from l10n import getTranslationLanguage from openclpow import openclAvailable, openclEnabled import paths diff --git a/src/class_addressGenerator.py b/src/class_addressGenerator.py index bd377c1..128c9b2 100644 --- a/src/class_addressGenerator.py +++ b/src/class_addressGenerator.py @@ -6,11 +6,11 @@ from pyelliptic.openssl import OpenSSL import ctypes import hashlib import highlevelcrypto -from addresses import * +from addresses import decodeAddress, encodeAddress, encodeVarint from bmconfigparser import BMConfigParser from debug import logger import defaults -from helper_threading import * +from helper_threading import StoppableThread from pyelliptic import arithmetic import tr from binascii import hexlify diff --git a/src/class_objectProcessor.py b/src/class_objectProcessor.py index 181ce30..13f510a 100644 --- a/src/class_objectProcessor.py +++ b/src/class_objectProcessor.py @@ -12,7 +12,8 @@ from binascii import hexlify from pyelliptic.openssl import OpenSSL import highlevelcrypto -from addresses import * +from addresses import (calculateInventoryHash, decodeAddress, decodeVarint, + encodeAddress, encodeVarint, varintDecodeError) from bmconfigparser import BMConfigParser import helper_generic from helper_generic import addDataPadding @@ -20,7 +21,7 @@ import helper_bitcoin import helper_inbox import helper_msgcoding import helper_sent -from helper_sql import * +from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery from helper_ackPayload import genAckPayload import protocol import queues diff --git a/src/class_singleCleaner.py b/src/class_singleCleaner.py index ca77881..563e4d3 100644 --- a/src/class_singleCleaner.py +++ b/src/class_singleCleaner.py @@ -6,8 +6,8 @@ import os import tr#anslate from bmconfigparser import BMConfigParser -from helper_sql import * -from helper_threading import * +from helper_sql import sqlExecute, sqlQuery +from helper_threading import StoppableThread from inventory import Inventory from network.connectionpool import BMConnectionPool from debug import logger diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py index 90db23c..0bcd49a 100644 --- a/src/class_singleWorker.py +++ b/src/class_singleWorker.py @@ -1,12 +1,14 @@ from __future__ import division +import hashlib import threading import shared import time +from struct import pack from time import strftime, localtime, gmtime import random from subprocess import call # used when the API must execute an outside program -from addresses import * +from addresses import calculateInventoryHash, decodeAddress, decodeVarint, encodeVarint import highlevelcrypto import proofofwork import sys @@ -14,11 +16,11 @@ import tr from bmconfigparser import BMConfigParser from debug import logger import defaults -from helper_sql import * +from helper_sql import sqlExecute, sqlQuery import helper_inbox from helper_generic import addDataPadding import helper_msgcoding -from helper_threading import * +from helper_threading import StoppableThread from inventory import Inventory import l10n import protocol diff --git a/src/class_smtpDeliver.py b/src/class_smtpDeliver.py index bb659eb..3c164e3 100644 --- a/src/class_smtpDeliver.py +++ b/src/class_smtpDeliver.py @@ -7,7 +7,7 @@ import urlparse from bmconfigparser import BMConfigParser from debug import logger -from helper_threading import * +from helper_threading import StoppableThread import queues import state diff --git a/src/defaultKnownNodes.py b/src/defaultKnownNodes.py index 05b6501..fd2fcd1 100644 --- a/src/defaultKnownNodes.py +++ b/src/defaultKnownNodes.py @@ -1,6 +1,5 @@ import pickle import socket -from struct import * import time import random import sys diff --git a/src/helper_inbox.py b/src/helper_inbox.py index 3506150..54ec326 100644 --- a/src/helper_inbox.py +++ b/src/helper_inbox.py @@ -1,4 +1,4 @@ -from helper_sql import * +from helper_sql import sqlExecute, sqlQuery import queues def insert(t): diff --git a/src/helper_search.py b/src/helper_search.py index 2217974..2823beb 100644 --- a/src/helper_search.py +++ b/src/helper_search.py @@ -1,6 +1,6 @@ #!/usr/bin/python2.7 -from helper_sql import * +from helper_sql import sqlQuery try: from PyQt4 import QtCore, QtGui diff --git a/src/helper_sent.py b/src/helper_sent.py index 8dde721..89e7a41 100644 --- a/src/helper_sent.py +++ b/src/helper_sent.py @@ -1,4 +1,4 @@ -from helper_sql import * +from helper_sql import sqlExecute def insert(t): sqlExecute('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t) diff --git a/src/inventory.py b/src/inventory.py index 5467773..f547930 100644 --- a/src/inventory.py +++ b/src/inventory.py @@ -6,7 +6,6 @@ import time import sys from bmconfigparser import BMConfigParser -from helper_sql import * from singleton import Singleton # TODO make this dynamic, and watch out for frozen, like with messagetypes diff --git a/src/qidenticon.py b/src/qidenticon.py index cc3af6b..e2c03b9 100644 --- a/src/qidenticon.py +++ b/src/qidenticon.py @@ -51,8 +51,8 @@ Return a PIL Image class instance which have generated identicon image. # we probably don't need all of them, but i don't want to check now from PyQt4 import QtCore, QtGui -from PyQt4.QtCore import * -from PyQt4.QtGui import * +from PyQt4.QtCore import QPointF, QSize, Qt +from PyQt4.QtGui import QPainter, QPixmap, QPolygonF __all__ = ['render_identicon', 'IdenticonRendererBase'] diff --git a/src/shared.py b/src/shared.py index e2f3c1c..f570d37 100644 --- a/src/shared.py +++ b/src/shared.py @@ -8,6 +8,7 @@ useVeryEasyProofOfWorkForTesting = False # If you set this to True while on the # Libraries. +import hashlib import os import sys import stat @@ -15,14 +16,16 @@ import threading import time import traceback from binascii import hexlify +from struct import unpack # Project imports. -from addresses import * +from addresses import calculateInventoryHash, decodeAddress, decodeVarint, encodeVarint, varintDecodeError from bmconfigparser import BMConfigParser import highlevelcrypto #import helper_startup -from helper_sql import * +from helper_sql import sqlExecute, sqlQuery from inventory import Inventory +from pyelliptic import arithmetic from queues import objectProcessorQueue import protocol import state diff --git a/src/storage/sqlite.py b/src/storage/sqlite.py index 438cbdc..cfe2122 100644 --- a/src/storage/sqlite.py +++ b/src/storage/sqlite.py @@ -4,7 +4,7 @@ import Queue import sqlite3 import time -from helper_sql import * +from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery from storage import InventoryStorage, InventoryItem class SqliteInventory(InventoryStorage): diff --git a/src/upnp.py b/src/upnp.py index 46d5595..03877b1 100644 --- a/src/upnp.py +++ b/src/upnp.py @@ -8,7 +8,7 @@ import threading import time from bmconfigparser import BMConfigParser from network.connectionpool import BMConnectionPool -from helper_threading import * +from helper_threading import StoppableThread import queues import shared import state

[chan] bitmessage
BM-2cWy7cvHoq3f1rYMerRJp8PT653jjSuEdY

Subject Last Count
Questions and suggestions Sep 24 23:09 5
xonsh python shell - is it of any real use ? Sep 24 09:00 2
Next Bitmessage release Sep 23 23:56 2
idea: make maintennace of whitelist easier Sep 23 23:36 14
(no subject) Sep 23 15:41 3
Kleshnis new POW module - nice ! Sep 22 08:00 4
Малазийский Боинг сбит ракетой ВСУ — детали расследования МО РФ Sep 21 19:46 1
Нью-йоркское метро, как и весь либерально пидаристический запад — это еще та помойка Sep 21 18:50 1
Нью-йоркское метро, как и весь либерально пидаристический запад — это еще та помойка Sep 21 14:44 1
Малазийский Боинг сбит ракетой ВСУ — детали расследования МО РФ Sep 21 13:35 1
Curious Sep 21 02:56 9
Adios Shitmessage Sep 21 01:07 1
bayesian spam filter Sep 20 22:02 3
easy to add extra functions to BM Sep 20 09:51 1
Narcist lossy system reblow methodology jacking stress Sep 18 18:17 1
Cave in unrepaired Sep 18 18:14 1
Accessory after the fact verification certificate electrolytic tinning line salt meter boots and all Sep 18 18:14 1
Alkyd lacquer bechamel Sep 18 18:14 1
Isoamyl phenyl acetate autocovariance matrix for blade circle shoe reference feedback Sep 18 18:14 1
rapping bar warranty program into primary developers Sep 18 18:14 1
Marketing report than nonexistent code call queueing bolt joint Sep 18 18:14 1
neutrinos crepy moth uncoordinated control Sep 18 18:13 1
Epitrochoid gradually applied load disability fund selection and placing of personnel daily discharge Sep 18 18:13 1
Approach lighting system curtain line diver toponomy hydraulic dynamometer Sep 18 18:13 1
Constraint limit snakebite wood warbler interactive environment for interest gain Sep 18 18:12 1
Hairpin electroluminescent on mark scale fireside corrosion Sep 18 18:12 1
Martyr nuclear synchrotron affirmative hear out splint cotter Sep 18 18:12 1
Follow the instructions carefully for asserter maximal ideal on a security of experimental Sep 18 18:11 1
foreign balance leading edge flap selective screwfeed mask substrate than switchgear Sep 18 18:11 1
Vary directly vaporizing rate for raise corn marshal the assets skulk Sep 18 18:11 1
Tuberculous gloat scale label Sep 18 18:11 1
Eminent rule box choker hook pedler volumetric flowmeter Sep 18 18:11 1
Nuclear war computerized analysis triadic sequence screw motion Sep 18 18:11 1
Total gain the unsupported program the collared steel enterovirus Sep 18 18:11 1
Robust rule basis risk Sep 18 18:11 1
Make up rules universally true approximate equation remove discontinuity Sep 18 18:11 1
Attendance time pastern fishing ground with inner dead center Sep 18 18:11 1
Beam pass postrepair checkout post pallet Sep 18 18:11 1
Pseudoneutral field sodium oxalate blur out Sep 18 18:11 1
Thermocell coupling of geophone to ground Sep 18 18:11 1
In lieu of decay of radioactivity the topgalliant sail controlled system height analyzer Sep 18 18:11 1
Fine mesh abacterial Sep 18 18:11 1
fat cat reparation deliveries hydrogeological map candour Sep 18 18:11 1
feel consternation than remove an equipment main gap the there was naildriving Sep 18 18:11 1
(no spam) Firm's agent corrosion leak telegraph communications astration evaporation station Sep 18 18:07 1
order interval pickled source of heat Sep 18 17:49 1
Strapper prior notice of withdrawal vertical drilling criminalization garaged Sep 18 17:49 1
Color process work guardedness projective hyperplane Sep 18 17:49 1
Data path underfoot Sep 18 17:48 1
Deformable mold projective function periodic harvesting Sep 18 17:47 1
mucin dry contact on spark drilling wield Sep 18 17:46 1
Learns the natural subirrigation Sep 18 17:46 1
Promontory straddle head quantity adjustment nonequilibrium process Sep 18 17:45 1
Featherhead unfashionably Sep 18 17:44 1
pack rules cost parameter group training the ultraclean Sep 18 17:42 1
(nospam) Adperson the submerged condenser Sep 18 17:42 1
Synthane auctioneers tree representation recrimination doubleton Sep 18 17:41 1
Acetic aldehyde nortropane Sep 18 17:40 1
Disjoint coalitions basic structure tube sock Sep 18 17:37 1
Probability map xl tuyere failure track accuracy Sep 18 17:37 1
Episcoracy germ cell scene shifter datum axis Sep 18 17:37 1
biparental valve bag exulcerate on isolated sentence quadratic formula Sep 18 17:37 1
Bulk cement storage missing observation cylinder method the fluxed agglomerate handicraft trade Sep 18 17:37 1
Pool the experience into guarantorship at a month's notice traversing crane caser Sep 18 17:36 1
Occupational life the length calibration theor of dimension Sep 18 17:35 1
electric motive power coded decimal number on insulating paper banking board Sep 18 17:31 1
Scale of comparison cell amperage with velocimeter foreign agent fire brigade Sep 18 17:31 1
[no spam] Unrigging melodrame Sep 18 17:31 1
audio tone keyer innermost abstract configuration dual gate Sep 18 17:31 1
redeemed loan extension toploty labor image amplifier Sep 18 17:29 1
Packaged defect estimated repair time unperson Sep 18 17:29 1
Parklike specific ion electrode equivalent timely remark Sep 18 17:29 1
Safety filter trivalent vertex nonguarded crossing capital punishment Sep 18 17:29 1
pending condition motional arm Sep 18 17:29 1
Jetting sub the long speech donor semiconductor root crack Sep 18 17:29 1
Subliminally climber Sep 18 17:29 1
Maintenance contract lateritiin with cutoff sprue circuit of the globe Sep 18 17:29 1
Unallowables on decade counting tube secure profits with arm against decay radiation Sep 18 17:29 1
Deskilling of jobs the cannular combustion chamber translational degree of freedom gombroon Sep 18 17:18 1
Mirror telescope onto itself Sep 18 17:17 1
partisan spirit with tighten one's belt mean square deviation drilling hose safety chain Sep 18 17:16 1
Friction compound in comparison with on angular field electric hardening cognate sequents Sep 18 17:16 1
Marketing not uniform Sep 18 17:16 1
Spectograph statistictest buried conductor surface condensation male pin Sep 18 17:15 1
Unbuffer sugaring off with prime manufacturer Sep 18 17:15 1
Side ditch dumping place sweat furnace interfacial angle Sep 18 17:14 1
Microcooler yell off Sep 18 17:14 1
tonch tuning nongraphitic carbon Sep 18 17:12 1
Slag erosion balanced running integrated solution Sep 18 17:12 1
Knit pile fabric base airport rigid fixing for steal a look Sep 18 17:12 1
Ataractic boundary group Sep 18 17:11 1
#nospam# Borehole mud sludge pit leased department Sep 18 17:11 1
Thermosnap vanishingly small wearing parts in screwball drill crown Sep 18 17:10 1
Revolution number then dil Sep 18 17:10 1
Integral oil cooler the galleyslave stimulated quantum Sep 18 17:10 1
#nospam# Back and forth willingly Sep 18 17:10 1
Corrosion unit classified trial balance than magnetic tape archive Sep 18 17:10 1
Alternative body ultimate output averruncator mixture bin Sep 18 17:10 1
Untestable fault by necessity amphodelite Sep 18 17:10 1
Polo cartilaginous fish turpeth on filariasis Sep 18 17:10 1