← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/python2.5/oneiric

« back to all changes in this revision

Viewing changes to Modules/_bsddb.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-12-21 08:57:49 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20081221085749-bijjr25h8na5jdsu
Tags: 2.5.3-0ubuntu1
* New upstream version.
* Regenerate the included documentation.
* Add an option --install-layout=deb, which is ignored for 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Modules/_bsddb.c
99
99
#endif
100
100
 
101
101
#define PY_BSDDB_VERSION "4.4.5.3"
102
 
static char *rcs_id = "$Id: _bsddb.c 60545 2008-02-03 07:26:23Z gregory.p.smith $";
 
102
static char *rcs_id = "$Id: _bsddb.c 63404 2008-05-17 06:46:39Z gregory.p.smith $";
103
103
 
104
104
 
105
105
#if (PY_VERSION_HEX < 0x02050000)
834
834
            Py_DECREF(self->myenvobj);
835
835
            self->myenvobj = NULL;
836
836
        }
837
 
        PyObject_Del(self);
 
837
        Py_DECREF(self);
838
838
        self = NULL;
839
839
    }
840
840
    return self;
955
955
    err = db_env_create(&self->db_env, flags);
956
956
    MYDB_END_ALLOW_THREADS;
957
957
    if (makeDBError(err)) {
958
 
        PyObject_Del(self);
 
958
        Py_DECREF(self);
959
959
        self = NULL;
960
960
    }
961
961
    else {
1004
1004
#endif
1005
1005
    MYDB_END_ALLOW_THREADS;
1006
1006
    if (makeDBError(err)) {
1007
 
        Py_DECREF(self->env);
1008
 
        PyObject_Del(self);
 
1007
        Py_DECREF(self);
1009
1008
        self = NULL;
1010
1009
    }
1011
1010
    return self;
1062
1061
#endif
1063
1062
    MYDB_END_ALLOW_THREADS;
1064
1063
    if (makeDBError(err)) {
1065
 
        PyObject_Del(self);
 
1064
        Py_DECREF(self);
1066
1065
        self = NULL;
1067
1066
    }
1068
1067
 
1103
1102
    err = db_sequence_create(&self->sequence, self->mydb->db, flags);
1104
1103
    MYDB_END_ALLOW_THREADS;
1105
1104
    if (makeDBError(err)) {
1106
 
        Py_DECREF(self->mydb);
1107
 
        PyObject_Del(self);
 
1105
        Py_DECREF(self);
1108
1106
        self = NULL;
1109
1107
    }
1110
1108