From 26d71b4cba31a62bc648bec353aab299adb391a6 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Wed, 19 Sep 2012 15:31:28 +0100 Subject: [PATCH] First parameter of register_json defaults to None --- lib/_json.py | 2 +- tests/test_types_extras.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/_json.py b/lib/_json.py index ec33a6aa..09d854b7 100644 --- a/lib/_json.py +++ b/lib/_json.py @@ -89,7 +89,7 @@ if json is None: raise ImportError("no json module available") -def register_json(conn_or_curs, globally=False, loads=None, +def register_json(conn_or_curs=None, globally=False, loads=None, oid=None, array_oid=None): """Create and register typecasters converting :sql:`json` type to Python objects. diff --git a/tests/test_types_extras.py b/tests/test_types_extras.py index bc32cd3b..b06973a1 100755 --- a/tests/test_types_extras.py +++ b/tests/test_types_extras.py @@ -935,7 +935,7 @@ class JsonTestCase(unittest.TestCase): olda = psycopg2.extensions.string_types.get(199) loads = lambda x: psycopg2.extras.json.loads(x, parse_float=Decimal) try: - new, newa = psycopg2.extras.register_json(None, + new, newa = psycopg2.extras.register_json( loads=loads, oid=oid, array_oid=array_oid) curs = self.conn.cursor() curs.execute("""select '{"a": 100.0, "b": null}'::json""")