Skip to content

Commit 0935c9d

Browse files
committed
Dropped debug info for microprotocols/adapters initialization
Not useful anymore (guess they were when those layers were created). Much shorter stream of messages on module init now.
1 parent d61c902 commit 0935c9d

File tree

9 files changed

+2
-33
lines changed

9 files changed

+2
-33
lines changed

psycopg/adapter_datetime.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
RAISES_NEG int
3939
psyco_adapter_datetime_init(void)
4040
{
41-
Dprintf("psyco_adapter_datetime_init: datetime init");
42-
4341
PyDateTime_IMPORT;
4442

4543
if (!PyDateTimeAPI) {

psycopg/adapter_mxdatetime.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
int
3939
psyco_adapter_mxdatetime_init(void)
4040
{
41-
Dprintf("psyco_adapter_mxdatetime_init: mx.DateTime init");
42-
4341
if (mxDateTime_ImportModuleAndAPI()) {
4442
Dprintf("psyco_adapter_mxdatetime_init: mx.DateTime initialization failed");
4543
PyErr_Clear();

psycopg/microprotocols.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ microprotocols_add(PyTypeObject *type, PyObject *proto, PyObject *cast)
6868

6969
if (proto == NULL) proto = (PyObject*)&isqlquoteType;
7070

71-
Dprintf("microprotocols_add: cast %p for (%s, ?)", cast, type->tp_name);
72-
7371
if (!(key = PyTuple_Pack(2, (PyObject*)type, proto))) { goto exit; }
7472
if (0 != PyDict_SetItem(psyco_adapters, key, cast)) { goto exit; }
7573

psycopg/psycopgmodule.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ adapters_init(PyObject *module)
303303

304304
if (0 > microprotocols_init(module)) { goto exit; }
305305

306-
Dprintf("psycopgmodule: configuring adapters");
306+
Dprintf("psycopgmodule: initializing adapters");
307307

308308
if (0 > microprotocols_add(&PyFloat_Type, NULL, (PyObject*)&pfloatType)) {
309309
goto exit;
@@ -935,7 +935,7 @@ datetime_init(void)
935935
{
936936
PyObject *dt = NULL;
937937

938-
Dprintf("psycopgmodule: datetime module");
938+
Dprintf("psycopgmodule: initializing datetime module");
939939

940940
/* import python builtin datetime module, if available */
941941
if (!(dt = PyImport_ImportModule("datetime"))) {

psycopg/replication_cursor_type.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ psyco_repl_curs_send_feedback(replicationCursorObject *self,
198198
RAISES_NEG int
199199
psyco_repl_curs_datetime_init(void)
200200
{
201-
Dprintf("psyco_repl_curs_datetime_init: datetime init");
202-
203201
PyDateTime_IMPORT;
204202

205203
if (!PyDateTimeAPI) {

psycopg/replication_message_type.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
RAISES_NEG int
3434
psyco_replmsg_datetime_init(void)
3535
{
36-
Dprintf("psyco_replmsg_datetime_init: datetime init");
37-
3836
PyDateTime_IMPORT;
3937

4038
if (!PyDateTimeAPI) {

psycopg/typecast.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ typecast_init(PyObject *module)
271271
/* insert the cast types into the 'types' dictionary and register them in
272272
the module dictionary */
273273
for (i = 0; typecast_builtins[i].name != NULL; i++) {
274-
Dprintf("typecast_init: initializing %s", typecast_builtins[i].name);
275-
276274
t = (typecastObject *)typecast_from_c(&(typecast_builtins[i]), dict);
277275
if (t == NULL) { goto exit; }
278276
if (typecast_add((PyObject *)t, NULL, 0) < 0) { goto exit; }
@@ -295,7 +293,6 @@ typecast_init(PyObject *module)
295293
#ifdef HAVE_MXDATETIME
296294
if (0 == psyco_typecast_mxdatetime_init()) {
297295
for (i = 0; typecast_mxdatetime[i].name != NULL; i++) {
298-
Dprintf("typecast_init: initializing %s", typecast_mxdatetime[i].name);
299296
t = (typecastObject *)typecast_from_c(&(typecast_mxdatetime[i]), dict);
300297
if (t == NULL) { goto exit; }
301298
PyDict_SetItem(dict, t->name, (PyObject *)t);
@@ -307,7 +304,6 @@ typecast_init(PyObject *module)
307304

308305
if (0 > psyco_typecast_datetime_init()) { goto exit; }
309306
for (i = 0; typecast_pydatetime[i].name != NULL; i++) {
310-
Dprintf("typecast_init: initializing %s", typecast_pydatetime[i].name);
311307
t = (typecastObject *)typecast_from_c(&(typecast_pydatetime[i]), dict);
312308
if (t == NULL) { goto exit; }
313309
PyDict_SetItem(dict, t->name, (PyObject *)t);
@@ -331,23 +327,15 @@ typecast_add(PyObject *obj, PyObject *dict, int binary)
331327

332328
typecastObject *type = (typecastObject *)obj;
333329

334-
Dprintf("typecast_add: object at %p, values refcnt = "
335-
FORMAT_CODE_PY_SSIZE_T,
336-
obj, Py_REFCNT(type->values)
337-
);
338-
339330
if (dict == NULL)
340331
dict = (binary ? psyco_binary_types : psyco_types);
341332

342333
len = PyTuple_Size(type->values);
343334
for (i = 0; i < len; i++) {
344335
val = PyTuple_GetItem(type->values, i);
345-
Dprintf("typecast_add: adding val: %ld", PyInt_AsLong(val));
346336
PyDict_SetItem(dict, val, obj);
347337
}
348338

349-
Dprintf("typecast_add: base caster: %p", type->bcast);
350-
351339
return 0;
352340
}
353341

@@ -531,9 +519,6 @@ typecast_new(PyObject *name, PyObject *values, PyObject *cast, PyObject *base)
531519
obj = PyObject_GC_New(typecastObject, &typecastType);
532520
if (obj == NULL) return NULL;
533521

534-
Dprintf("typecast_new: new type at = %p, refcnt = " FORMAT_CODE_PY_SSIZE_T,
535-
obj, Py_REFCNT(obj));
536-
537522
Py_INCREF(values);
538523
obj->values = values;
539524

@@ -560,8 +545,6 @@ typecast_new(PyObject *name, PyObject *values, PyObject *cast, PyObject *base)
560545

561546
PyObject_GC_Track(obj);
562547

563-
Dprintf("typecast_new: typecast object created at %p", obj);
564-
565548
return (PyObject *)obj;
566549
}
567550

psycopg/typecast_datetime.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
RAISES_NEG static int
3030
psyco_typecast_datetime_init(void)
3131
{
32-
Dprintf("psyco_typecast_datetime_init: datetime init");
33-
3432
PyDateTime_IMPORT;
3533

3634
if (!PyDateTimeAPI) {

psycopg/typecast_mxdatetime.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
static int
3232
psyco_typecast_mxdatetime_init(void)
3333
{
34-
Dprintf("psyco_typecast_mxdatetime_init: mx.DateTime init");
35-
3634
if (mxDateTime_ImportModuleAndAPI()) {
3735
Dprintf("psyco_typecast_mxdatetime_init: mx.DateTime initialization failed");
3836
PyErr_Clear();

0 commit comments

Comments
 (0)