Commit 3d523683 authored by Jim Fulton's avatar Jim Fulton

merged spelling fixes from trunk r76952

parent 303cf766
...@@ -206,7 +206,7 @@ set_operation(PyObject *s1, PyObject *s2, ...@@ -206,7 +206,7 @@ set_operation(PyObject *s1, PyObject *s2,
The following ifdef works around a template/type problem The following ifdef works around a template/type problem
Weights are passed as integers. In particular, the weight passed by Weights are passed as integers. In particular, the weight passed by
difference is one. This works find in the int value and float value difference is one. This works fine in the int value and float value
cases but makes no sense in the object value case. In the object cases but makes no sense in the object value case. In the object
value case, we don't do merging, so we don't use the weights, so it value case, we don't do merging, so we don't use the weights, so it
doesn't matter what they are. doesn't matter what they are.
......
...@@ -787,8 +787,8 @@ class Connection(ExportImport, object): ...@@ -787,8 +787,8 @@ class Connection(ExportImport, object):
return self._reader.getState(p) return self._reader.getState(p)
def setstate(self, obj): def setstate(self, obj):
"""Turns the ghost 'obj' into a real object by loading it's from the """Turns the ghost 'obj' into a real object by loading its state from
database.""" the database."""
oid = obj._p_oid oid = obj._p_oid
if self._opened is None: if self._opened is None:
...@@ -823,6 +823,7 @@ class Connection(ExportImport, object): ...@@ -823,6 +823,7 @@ class Connection(ExportImport, object):
# Does anything actually use _p_independent()? It would simplify # Does anything actually use _p_independent()? It would simplify
# the code if we could drop support for it. # the code if we could drop support for it.
# (BTrees.Length does.)
# There is a harmless data race with self._invalidated. A # There is a harmless data race with self._invalidated. A
# dict update could go on in another thread, but we don't care # dict update could go on in another thread, but we don't care
......
...@@ -530,7 +530,7 @@ class FileStorage(BaseStorage.BaseStorage, ...@@ -530,7 +530,7 @@ class FileStorage(BaseStorage.BaseStorage,
return data, h.tid return data, h.tid
else: else:
# Get the data from the backpointer, but tid from # Get the data from the backpointer, but tid from
# currnt txn. # current txn.
data = self._loadBack_impl(oid, h.back)[0] data = self._loadBack_impl(oid, h.back)[0]
return data, h.tid return data, h.tid
finally: finally:
......
...@@ -21,7 +21,7 @@ And create a persistent object in the first database: ...@@ -21,7 +21,7 @@ And create a persistent object in the first database:
>>> tm.commit() >>> tm.commit()
First, we get a connection to the second database. We get the second First, we get a connection to the second database. We get the second
connection using the first connection's `get_connextion` method. This connection using the first connection's `get_connection` method. This
is important. When using multiple databases, we need to make sure we is important. When using multiple databases, we need to make sure we
use a consistent set of connections so that the objects in the use a consistent set of connections so that the objects in the
connection caches are connected in a consistent manner. connection caches are connected in a consistent manner.
...@@ -71,7 +71,7 @@ Databases for new objects ...@@ -71,7 +71,7 @@ Databases for new objects
Objects are normally added to a database by making them reachable from Objects are normally added to a database by making them reachable from
an object already in the database. This is unambiguous when there is an object already in the database. This is unambiguous when there is
only one database. With modultiple databases, it is not so clear what only one database. With multiple databases, it is not so clear what
happens. Consider: happens. Consider:
>>> p4 = MyClass() >>> p4 = MyClass()
......
...@@ -106,11 +106,11 @@ oid ...@@ -106,11 +106,11 @@ oid
'n' 'n'
Multi-database simple object reference. The arguments consist Multi-database simple object reference. The arguments consist
of a databaase name, and an object id. of a database name, and an object id.
'm' 'm'
Multi-database persistent object reference. The arguments consist Multi-database persistent object reference. The arguments consist
of a databaase name, an object id, and class meta data. of a database name, an object id, and class meta data.
The following legacy format is also supported. The following legacy format is also supported.
......
...@@ -29,8 +29,8 @@ class MyClass_w_getnewargs(persistent.Persistent): ...@@ -29,8 +29,8 @@ class MyClass_w_getnewargs(persistent.Persistent):
def test_must_use_consistent_connections(): def test_must_use_consistent_connections():
""" """
It's important to use consistent connections. References to to It's important to use consistent connections. References to
separate connections to the ssme database or multi-database won't separate connections to the same database or multi-database won't
work. work.
For example, it's tempting to open a second database using the For example, it's tempting to open a second database using the
......
...@@ -85,7 +85,7 @@ unghostify(cPersistentObject *self) ...@@ -85,7 +85,7 @@ unghostify(cPersistentObject *self)
if (self->state < 0 && self->jar) { if (self->state < 0 && self->jar) {
PyObject *r; PyObject *r;
/* Is it ever possibly to not have a cache? */ /* Is it ever possible to not have a cache? */
if (self->cache) { if (self->cache) {
/* Create a node in the ring for this unghostified object. */ /* Create a node in the ring for this unghostified object. */
self->cache->non_ghost_count++; self->cache->non_ghost_count++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment