From fc46b70c413d5b2ecd554a154afab1eab6e95560 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 25 Feb 2011 14:18:12 -0500 Subject: [PATCH] Rename decimal.py to decimal_wrapper.py so we don't break when cdecimal is not installed. --- pyfpdb/AlchemyFacilities.py | 2 +- pyfpdb/AlchemyMappings.py | 2 +- pyfpdb/CarbonToFpdb.py | 2 +- pyfpdb/Database.py | 2 +- pyfpdb/DerivedStats.py | 2 +- pyfpdb/EverestToFpdb.py | 2 +- pyfpdb/FullTiltPokerSummary.py | 2 +- pyfpdb/Hand.py | 2 +- pyfpdb/HandHistoryConverter.py | 2 +- pyfpdb/OnGameToFpdb.py | 2 +- pyfpdb/PokerStarsSummary.py | 2 +- pyfpdb/PokerStarsToFpdb.py | 2 +- pyfpdb/SitenameSummary.py | 2 +- pyfpdb/TourneySummary.py | 2 +- pyfpdb/WinamaxSummary.py | 2 +- pyfpdb/WinamaxToFpdb.py | 2 +- pyfpdb/{decimal.py => decimal_wrapper.py} | 0 pyfpdb/iPokerToFpdb.py | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename pyfpdb/{decimal.py => decimal_wrapper.py} (100%) diff --git a/pyfpdb/AlchemyFacilities.py b/pyfpdb/AlchemyFacilities.py index fd2082d1..a7f85cd7 100644 --- a/pyfpdb/AlchemyFacilities.py +++ b/pyfpdb/AlchemyFacilities.py @@ -17,7 +17,7 @@ #TODO: gettextify if file is used again -from decimal import Decimal +from decimal_wrapper import Decimal from sqlalchemy import types from sqlalchemy.orm.exc import NoResultFound diff --git a/pyfpdb/AlchemyMappings.py b/pyfpdb/AlchemyMappings.py index b5891c25..a0ddcd25 100644 --- a/pyfpdb/AlchemyMappings.py +++ b/pyfpdb/AlchemyMappings.py @@ -23,7 +23,7 @@ This package contains all classes to be mapped and mappers themselves import logging import re -from decimal import Decimal +from decimal_wrapper import Decimal from sqlalchemy.orm import mapper, relation, reconstructor from sqlalchemy.sql import select from collections import defaultdict diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py index b9d80791..2c5dbd5b 100644 --- a/pyfpdb/CarbonToFpdb.py +++ b/pyfpdb/CarbonToFpdb.py @@ -53,7 +53,7 @@ _ = L10n.get_translation() import sys import logging from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal class Carbon(HandHistoryConverter): diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 6340660d..2e864e21 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -38,7 +38,7 @@ import sys import traceback from datetime import datetime, date, time, timedelta from time import time, strftime, sleep -from decimal import Decimal +from decimal_wrapper import Decimal import string import re import Queue diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 93c09571..86a363f3 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -17,7 +17,7 @@ #fpdb modules import Card -from decimal import Decimal +from decimal_wrapper import Decimal import logging # logging has been set up in fpdb.py or HUD_main.py, use their settings: diff --git a/pyfpdb/EverestToFpdb.py b/pyfpdb/EverestToFpdb.py index f910ba2f..a9abebc1 100644 --- a/pyfpdb/EverestToFpdb.py +++ b/pyfpdb/EverestToFpdb.py @@ -25,7 +25,7 @@ _ = L10n.get_translation() import sys import logging from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal class Everest(HandHistoryConverter): diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index 2edcd81e..1172d27c 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -20,7 +20,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from Exceptions import FpdbParseError diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 6e642c20..506b6114 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -25,7 +25,7 @@ import sys import traceback import os import os.path -from decimal import Decimal +from decimal_wrapper import Decimal import operator import time,datetime from copy import deepcopy diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 3f0c51bd..8cf45f02 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -26,7 +26,7 @@ import os import os.path import xml.dom.minidom import codecs -from decimal import Decimal +from decimal_wrapper import Decimal import operator from xml.dom.minidom import Node diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index 889f2d24..a7423c00 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -31,7 +31,7 @@ log = logging.getLogger("parser") import Configuration from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal # OnGame HH Format diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index 01a9223b..4caa7a3f 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -20,7 +20,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from Exceptions import FpdbParseError diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 4096ca92..060ad85c 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -25,7 +25,7 @@ _ = L10n.get_translation() import sys from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal # PokerStars HH Format diff --git a/pyfpdb/SitenameSummary.py b/pyfpdb/SitenameSummary.py index d06b9831..f3b76700 100644 --- a/pyfpdb/SitenameSummary.py +++ b/pyfpdb/SitenameSummary.py @@ -20,7 +20,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from Exceptions import FpdbParseError diff --git a/pyfpdb/TourneySummary.py b/pyfpdb/TourneySummary.py index d83ac1a8..1def7703 100644 --- a/pyfpdb/TourneySummary.py +++ b/pyfpdb/TourneySummary.py @@ -28,7 +28,7 @@ import traceback import logging import os import os.path -from decimal import Decimal +from decimal_wrapper import Decimal import operator import time,datetime from copy import deepcopy diff --git a/pyfpdb/WinamaxSummary.py b/pyfpdb/WinamaxSummary.py index c3a5bd14..c466fbd2 100644 --- a/pyfpdb/WinamaxSummary.py +++ b/pyfpdb/WinamaxSummary.py @@ -18,7 +18,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from BeautifulSoup import BeautifulSoup diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index 6aa6f51c..d0540ec0 100644 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -29,7 +29,7 @@ import logging import Configuration from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal import time # Winamax HH Format diff --git a/pyfpdb/decimal.py b/pyfpdb/decimal_wrapper.py similarity index 100% rename from pyfpdb/decimal.py rename to pyfpdb/decimal_wrapper.py diff --git a/pyfpdb/iPokerToFpdb.py b/pyfpdb/iPokerToFpdb.py index 4766d72e..950a9901 100644 --- a/pyfpdb/iPokerToFpdb.py +++ b/pyfpdb/iPokerToFpdb.py @@ -46,7 +46,7 @@ _ = L10n.get_translation() import sys import logging from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal class iPoker(HandHistoryConverter):