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
Bitmessage Noisebot Updated Dec 10 14:48 7
Bitmessage noisebot sends randomly-timed noise messages via the PyBitmessage API. Dec 10 14:42 11
Abandoning Bitmessage Chans Dec 10 12:05 19
Is Bitmessage censored? Dec 10 11:44 21
test help Dec 10 10:20 3
chanerator v0.0.1 Dec 9 10:41 1
OMEMO jabber/XMPP chat using Gajim IM Dec 9 09:05 4
OMEMO only 1000 people use XMPP Dec 9 03:09 1
GB2RS News - Sunday 9th December 2018 Dec 9 00:02 1
censorship Dec 8 17:30 2
Be warned! GOD is watching YOU (even on BM) Dec 6 11:16 2
UK Column News - 4th December 2018 Dec 5 22:41 1
UK Column News - 3rd December 2018 Dec 5 22:31 2
Tips for securing Bitmessage Dec 3 08:24 1
Hello Dec 3 08:07 1
What does Bitmessage really have to offer? Dec 3 06:09 15
UK Column News - 05 Decmber 2018 Dec 2 03:16 1
UK Column News - 04 December 2018 Dec 2 03:12 1
UK Column News - 02 December 2018 Dec 2 03:07 1
Bitmessage Network Health Report Dec 2 01:03 12
jo Dec 1 00:18 4
bug? send != receive Nov 30 12:52 1
Quick and Easy Chicken Madras Nov 23 16:42 1
BM Nov 23 16:21 7
It's 'Anything can happen' Friday! Nov 23 16:10 1
need an editor ? Nov 21 13:33 10
gibs ne Chance, Namecoin mit pyBM ans Laufen zu kriegen ? Nov 21 13:00 1
Vuvuzela - anonymous messaging that scales to millions of users Nov 19 11:56 20
How do I benchmark bitmessage PoW Nov 15 22:13 3
Support request -- GPUs (Intel(R) HD Graphics IvyBridge M GT1) did not calculate correctly Nov 15 17:04 2
Spam... Nov 15 17:02 4
Ebola on the rampage in USA again Nov 13 06:47 1
ending the waffle Nov 13 04:56 1