psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 17:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove workaround for decimal module

Browse Source 
The decimal module is available on all Python versions supported by
psycopg2. It has been available since Python 2.4. No need to catch an
ImportError.

https://docs.python.org/2/library/decimal.html
This commit is contained in:
Jon Dufresne 2017-11-26 17:55:24 -08:00
parent 858bc3d42a
commit 048f1bb95a
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/__init__.py
View File

@ -72,14 +72,10 @@ _ext.register_adapter(type(None), _ext.NoneAdapter)
# Register the Decimal adapter here instead of in the C layer. # Register the Decimal adapter here instead of in the C layer.
# This way a new class is registered for each sub-interpreter. # This way a new class is registered for each sub-interpreter.
# See ticket #52 # See ticket #52
try: from decimal import Decimal
from decimal import Decimal from psycopg2._psycopg import Decimal as Adapter
except ImportError: _ext.register_adapter(Decimal, Adapter)
pass del Decimal, Adapter
else:
from psycopg2._psycopg import Decimal as Adapter
_ext.register_adapter(Decimal, Adapter)
del Decimal, Adapter
def connect(dsn=None, connection_factory=None, cursor_factory=None, **kwargs): def connect(dsn=None, connection_factory=None, cursor_factory=None, **kwargs):

14
tests/test_cursor.py
View File

@ -98,11 +98,7 @@ class CursorTests(ConnectingTestCase):
cur.mogrify(u"SELECT %s;", (snowman,))) cur.mogrify(u"SELECT %s;", (snowman,)))
def test_mogrify_decimal_explodes(self): def test_mogrify_decimal_explodes(self):
# issue #7: explodes on windows with python 2.5 and psycopg 2.2.2 from decimal import Decimal
try:
from decimal import Decimal
except:
return
conn = self.conn conn = self.conn
cur = conn.cursor() cur = conn.cursor()
@ -138,12 +134,8 @@ class CursorTests(ConnectingTestCase):
self.assertEqual(42, curs.cast(20, '42')) self.assertEqual(42, curs.cast(20, '42'))
self.assertAlmostEqual(3.14, curs.cast(700, '3.14')) self.assertAlmostEqual(3.14, curs.cast(700, '3.14'))
try: from decimal import Decimal
from decimal import Decimal self.assertEqual(Decimal('123.45'), curs.cast(1700, '123.45'))
except ImportError:
self.assertAlmostEqual(123.45, curs.cast(1700, '123.45'))
else:
self.assertEqual(Decimal('123.45'), curs.cast(1700, '123.45'))
from datetime import date from datetime import date
self.assertEqual(date(2011, 1, 2), curs.cast(1082, '2011-01-02')) self.assertEqual(date(2011, 1, 2), curs.cast(1082, '2011-01-02'))