Project: Python

Revision: 66182

Author: jesus.cea

Date: 03 Sep 2008 13:50:32

• /python/trunk/Modules/bsddb.h

  ......	@@ -105,7 +105,7 @@
  105	105	#error "eek! DBVER can't handle minor versions > 9"
  106	106	#endif
  107	107
  108		#define PY_BSDDB_VERSION "4.7.3pre3"
  	108	#define PY_BSDDB_VERSION "4.7.3pre4"
  109	109
  110	110	/* Python object definitions */
  111	111

• /python/trunk/Modules/_bsddb.c

  ......	@@ -1106,7 +1106,7 @@
  1106	1106	{
  1107	1107	PyObject *dummy;
  1108	1108
  1109		if (self->db_env && !self->closed) {
  	1109	if (self->db_env) {
  1110	1110	dummy=DBEnv_close_internal(self,0);
  1111	1111	Py_XDECREF(dummy);
  1112	1112	}
  ......	@@ -3981,13 +3981,15 @@
  3981	3981	dummy=DB_close_internal(self->children_dbs,0);
  3982	3982	Py_XDECREF(dummy);
  3983	3983	}
  	3984	}
  3984	3985
  	3986	self->closed = 1;
  	3987	if (self->db_env) {
  3985	3988	MYDB_BEGIN_ALLOW_THREADS;
  3986	3989	err = self->db_env->close(self->db_env, flags);
  3987	3990	MYDB_END_ALLOW_THREADS;
  3988	3991	/* after calling DBEnv->close, regardless of error, this DBEnv
  3989	3992	* may not be accessed again (Berkeley DB docs). */
  3990		self->closed = 1;
  3991	3993	self->db_env = NULL;
  3992	3994	RETURN_IF_ERR();
  3993	3995	}
  ......	@@ -6148,7 +6150,7 @@
  6148	6150	err = self->sequence->open(self->sequence, txn, &key, flags);
  6149	6151	MYDB_END_ALLOW_THREADS
  6150	6152
  6151		CLEAR_DBT(key);
  	6153	FREE_DBT(key);
  6152	6154	RETURN_IF_ERR();
  6153	6155
  6154	6156	if (txn) {