From 6062277d60abb82e7bcf5cb77882c6f81b721332 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Wed, 22 Feb 2017 09:34:54 +0100 Subject: [PATCH] Rename configparser.py to bmconfigparser.py - it was causing problems with py2app because the source of python's own CongigParser is also configparser.py --- src/api.py | 2 +- src/bitmessagecli.py | 2 +- src/bitmessagecurses/__init__.py | 2 +- src/bitmessagemain.py | 2 +- src/bitmessageqt/__init__.py | 2 +- src/bitmessageqt/account.py | 2 +- src/bitmessageqt/bitmessageui.py | 2 +- src/bitmessageqt/blacklist.py | 2 +- src/bitmessageqt/foldertree.py | 2 +- src/bitmessageqt/languagebox.py | 2 +- src/bitmessageqt/support.py | 2 +- src/bitmessageqt/utils.py | 2 +- src/{configparser.py => bmconfigparser.py} | 0 src/class_addressGenerator.py | 2 +- src/class_objectProcessor.py | 2 +- src/class_outgoingSynSender.py | 2 +- src/class_receiveDataThread.py | 2 +- src/class_singleCleaner.py | 2 +- src/class_singleListener.py | 2 +- src/class_singleWorker.py | 2 +- src/class_smtpDeliver.py | 2 +- src/class_smtpServer.py | 2 +- src/class_sqlThread.py | 2 +- src/helper_bootstrap.py | 2 +- src/helper_generic.py | 2 +- src/helper_startup.py | 2 +- src/l10n.py | 2 +- src/namecoin.py | 2 +- src/openclpow.py | 2 +- src/proofofwork.py | 2 +- src/protocol.py | 2 +- src/shared.py | 2 +- src/shutdown.py | 2 +- src/throttle.py | 2 +- src/tr.py | 2 +- src/upnp.py | 2 +- 36 files changed, 35 insertions(+), 35 deletions(-) rename src/{configparser.py => bmconfigparser.py} (100%) diff --git a/src/api.py b/src/api.py index 27e2f7d6..d6d0b266 100644 --- a/src/api.py +++ b/src/api.py @@ -19,7 +19,7 @@ from binascii import hexlify import shared import time from addresses import decodeAddress,addBMIfNotPresent,decodeVarint,calculateInventoryHash,varintDecodeError -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import defaults import helper_inbox import helper_sent diff --git a/src/bitmessagecli.py b/src/bitmessagecli.py index 74836877..068a5597 100644 --- a/src/bitmessagecli.py +++ b/src/bitmessagecli.py @@ -16,7 +16,7 @@ import time import sys import os -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser api = '' keysName = 'keys.dat' diff --git a/src/bitmessagecurses/__init__.py b/src/bitmessagecurses/__init__.py index 2cfb8c67..d710720f 100644 --- a/src/bitmessagecurses/__init__.py +++ b/src/bitmessagecurses/__init__.py @@ -23,7 +23,7 @@ from helper_sql import * from addresses import * import ConfigParser -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from inventory import Inventory import l10n from pyelliptic.openssl import OpenSSL diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 3f28cd87..707b6b62 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -44,7 +44,7 @@ from class_singleWorker import singleWorker from class_addressGenerator import addressGenerator from class_smtpDeliver import smtpDeliver from class_smtpServer import smtpServer -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger # Helper Functions diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index cbf6217f..18bd70ed 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -30,7 +30,7 @@ except AttributeError: from addresses import * import shared from bitmessageui import * -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import defaults from namecoin import namecoinConnection, ensureNamecoinOptions from newaddressdialog import * diff --git a/src/bitmessageqt/account.py b/src/bitmessageqt/account.py index 03a22be0..7db5fa5a 100644 --- a/src/bitmessageqt/account.py +++ b/src/bitmessageqt/account.py @@ -6,7 +6,7 @@ import sys import inspect from helper_sql import * from addresses import decodeAddress -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from foldertree import AccountMixin from pyelliptic.openssl import OpenSSL from utils import str_broadcast_subscribers diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py index 668fbffd..f001487e 100644 --- a/src/bitmessageqt/bitmessageui.py +++ b/src/bitmessageqt/bitmessageui.py @@ -8,7 +8,7 @@ # WARNING! All changes made in this file will be lost! from PyQt4 import QtCore, QtGui -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from foldertree import AddressBookCompleter from messageview import MessageView from messagecompose import MessageCompose diff --git a/src/bitmessageqt/blacklist.py b/src/bitmessageqt/blacklist.py index 29a324c0..e07f9469 100644 --- a/src/bitmessageqt/blacklist.py +++ b/src/bitmessageqt/blacklist.py @@ -3,7 +3,7 @@ from tr import _translate import l10n import widgets from addresses import addBMIfNotPresent -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from dialogs import AddAddressDialog from helper_sql import sqlExecute, sqlQuery from retranslateui import RetranslateMixin diff --git a/src/bitmessageqt/foldertree.py b/src/bitmessageqt/foldertree.py index 4392495d..7cc42229 100644 --- a/src/bitmessageqt/foldertree.py +++ b/src/bitmessageqt/foldertree.py @@ -1,7 +1,7 @@ from PyQt4 import QtCore, QtGui from string import find, rfind, rstrip, lstrip -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from helper_sql import * from utils import * from settingsmixin import SettingsMixin diff --git a/src/bitmessageqt/languagebox.py b/src/bitmessageqt/languagebox.py index 8cce1e03..552e0350 100644 --- a/src/bitmessageqt/languagebox.py +++ b/src/bitmessageqt/languagebox.py @@ -2,7 +2,7 @@ import glob import os from PyQt4 import QtCore, QtGui -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import paths class LanguageBox(QtGui.QComboBox): diff --git a/src/bitmessageqt/support.py b/src/bitmessageqt/support.py index 60e9fa58..67e46500 100644 --- a/src/bitmessageqt/support.py +++ b/src/bitmessageqt/support.py @@ -5,7 +5,7 @@ import sys import time import account -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import defaults from foldertree import AccountMixin diff --git a/src/bitmessageqt/utils.py b/src/bitmessageqt/utils.py index fd18183d..73367586 100644 --- a/src/bitmessageqt/utils.py +++ b/src/bitmessageqt/utils.py @@ -2,7 +2,7 @@ from PyQt4 import QtGui import hashlib import os from addresses import addBMIfNotPresent -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import state str_broadcast_subscribers = '[Broadcast subscribers]' diff --git a/src/configparser.py b/src/bmconfigparser.py similarity index 100% rename from src/configparser.py rename to src/bmconfigparser.py diff --git a/src/class_addressGenerator.py b/src/class_addressGenerator.py index d938a43b..bd377c1d 100644 --- a/src/class_addressGenerator.py +++ b/src/class_addressGenerator.py @@ -7,7 +7,7 @@ import ctypes import hashlib import highlevelcrypto from addresses import * -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import defaults from helper_threading import * diff --git a/src/class_objectProcessor.py b/src/class_objectProcessor.py index b9969d9e..446e09ab 100644 --- a/src/class_objectProcessor.py +++ b/src/class_objectProcessor.py @@ -13,7 +13,7 @@ from binascii import hexlify from pyelliptic.openssl import OpenSSL import highlevelcrypto from addresses import * -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import helper_generic from helper_generic import addDataPadding import helper_bitcoin diff --git a/src/class_outgoingSynSender.py b/src/class_outgoingSynSender.py index a41ae75a..254caabb 100644 --- a/src/class_outgoingSynSender.py +++ b/src/class_outgoingSynSender.py @@ -11,7 +11,7 @@ import tr from class_sendDataThread import * from class_receiveDataThread import * -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from helper_threading import * import knownnodes import queues diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py index 10befd06..d3bcd689 100644 --- a/src/class_receiveDataThread.py +++ b/src/class_receiveDataThread.py @@ -24,7 +24,7 @@ from binascii import hexlify #import highlevelcrypto from addresses import * -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from class_objectHashHolder import objectHashHolder from helper_generic import addDataPadding, isHostInPrivateIPRange from helper_sql import sqlQuery diff --git a/src/class_singleCleaner.py b/src/class_singleCleaner.py index 3be3ef21..921e84ed 100644 --- a/src/class_singleCleaner.py +++ b/src/class_singleCleaner.py @@ -5,7 +5,7 @@ import sys import os import tr#anslate -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from helper_sql import * from helper_threading import * from inventory import Inventory diff --git a/src/class_singleListener.py b/src/class_singleListener.py index 49acc71c..0a8c4a93 100644 --- a/src/class_singleListener.py +++ b/src/class_singleListener.py @@ -1,7 +1,7 @@ import threading import shared import socket -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from class_sendDataThread import * from class_receiveDataThread import * import helper_bootstrap diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py index fc2ecebe..863fbde9 100644 --- a/src/class_singleWorker.py +++ b/src/class_singleWorker.py @@ -11,7 +11,7 @@ import highlevelcrypto import proofofwork import sys import tr -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import defaults from helper_sql import * diff --git a/src/class_smtpDeliver.py b/src/class_smtpDeliver.py index b3be09c0..9492f123 100644 --- a/src/class_smtpDeliver.py +++ b/src/class_smtpDeliver.py @@ -5,7 +5,7 @@ import sys import threading import urlparse -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger from helper_threading import * import queues diff --git a/src/class_smtpServer.py b/src/class_smtpServer.py index 359c8625..13882a94 100644 --- a/src/class_smtpServer.py +++ b/src/class_smtpServer.py @@ -11,7 +11,7 @@ import threading import time from addresses import decodeAddress -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger from helper_sql import sqlExecute from helper_threading import StoppableThread diff --git a/src/class_sqlThread.py b/src/class_sqlThread.py index 332a40ec..b46a570f 100644 --- a/src/class_sqlThread.py +++ b/src/class_sqlThread.py @@ -1,5 +1,5 @@ import threading -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import sqlite3 import time import shutil # used for moving the messages.dat file diff --git a/src/helper_bootstrap.py b/src/helper_bootstrap.py index 795b4d2a..33a533ca 100644 --- a/src/helper_bootstrap.py +++ b/src/helper_bootstrap.py @@ -3,7 +3,7 @@ import defaultKnownNodes import pickle import time -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import knownnodes import socks diff --git a/src/helper_generic.py b/src/helper_generic.py index 1e70b3e0..f2a293cd 100644 --- a/src/helper_generic.py +++ b/src/helper_generic.py @@ -5,7 +5,7 @@ from binascii import hexlify, unhexlify from multiprocessing import current_process from threading import current_thread, enumerate -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import queues import shutdown diff --git a/src/helper_startup.py b/src/helper_startup.py index ca89d111..6402ee89 100644 --- a/src/helper_startup.py +++ b/src/helper_startup.py @@ -1,5 +1,5 @@ import ConfigParser -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import defaults import sys import os diff --git a/src/l10n.py b/src/l10n.py index 31df0656..b3b16341 100644 --- a/src/l10n.py +++ b/src/l10n.py @@ -3,7 +3,7 @@ import logging import os import time -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser #logger = logging.getLogger(__name__) diff --git a/src/namecoin.py b/src/namecoin.py index 1834458c..2cfa5a1d 100644 --- a/src/namecoin.py +++ b/src/namecoin.py @@ -26,7 +26,7 @@ import socket import sys import os -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import defaults import tr # translate diff --git a/src/openclpow.py b/src/openclpow.py index b8c73987..50de80ab 100644 --- a/src/openclpow.py +++ b/src/openclpow.py @@ -5,7 +5,7 @@ import hashlib import random import os -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import paths from state import shutdown from debug import logger diff --git a/src/proofofwork.py b/src/proofofwork.py index dfae42fe..e20d6cff 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -6,7 +6,7 @@ from struct import unpack, pack from subprocess import call import sys import time -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import paths import openclpow diff --git a/src/protocol.py b/src/protocol.py index 4b1c67ff..82edbd15 100644 --- a/src/protocol.py +++ b/src/protocol.py @@ -10,7 +10,7 @@ import time import traceback from addresses import calculateInventoryHash, encodeVarint, decodeVarint, decodeAddress, varintDecodeError -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger import defaults from helper_sql import sqlExecute diff --git a/src/shared.py b/src/shared.py index 4fefa0f8..c28392f6 100644 --- a/src/shared.py +++ b/src/shared.py @@ -18,7 +18,7 @@ from binascii import hexlify # Project imports. from addresses import * -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser import highlevelcrypto #import helper_startup from helper_sql import * diff --git a/src/shutdown.py b/src/shutdown.py index bf1a4d12..a066104c 100644 --- a/src/shutdown.py +++ b/src/shutdown.py @@ -5,7 +5,7 @@ import time from class_outgoingSynSender import outgoingSynSender from class_sendDataThread import sendDataThread -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from debug import logger from helper_sql import sqlQuery, sqlStoredProcedure from helper_threading import StoppableThread diff --git a/src/throttle.py b/src/throttle.py index 6ed154ee..6e53f217 100644 --- a/src/throttle.py +++ b/src/throttle.py @@ -2,7 +2,7 @@ import math import threading import time -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from singleton import Singleton import state diff --git a/src/tr.py b/src/tr.py index 5146a162..c185690c 100644 --- a/src/tr.py +++ b/src/tr.py @@ -1,6 +1,6 @@ import os -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser # This is used so that the translateText function can be used when we are in daemon mode and not using any QT functions. class translateClass: diff --git a/src/upnp.py b/src/upnp.py index fa969f36..29f1c937 100644 --- a/src/upnp.py +++ b/src/upnp.py @@ -6,7 +6,7 @@ import socket from struct import unpack, pack import threading import time -from configparser import BMConfigParser +from bmconfigparser import BMConfigParser from helper_threading import * import queues import shared