summaryrefslogtreecommitdiff
path: root/gitdb
diff options
context:
space:
mode:
authorYaroslav Halchenko <debian@onerussian.com>2015-01-08 13:10:28 -0500
committerYaroslav Halchenko <debian@onerussian.com>2015-01-08 13:11:57 -0500
commit13ad9b1199331a35e23f65c735acf482be09eae3 (patch)
tree094ce9ebcd9db7ae802d33693995b3295d38f473 /gitdb
parenta88a777df3909a61be97f1a7b1194dad6de25702 (diff)
downloadgitdb-13ad9b1199331a35e23f65c735acf482be09eae3.tar.gz
minor spell fixes + empty line unification + comparison for python 2.6
Diffstat (limited to 'gitdb')
-rw-r--r--gitdb/base.py6
-rw-r--r--gitdb/exc.py2
-rw-r--r--gitdb/stream.py6
-rw-r--r--gitdb/util.py2
4 files changed, 7 insertions, 9 deletions
diff --git a/gitdb/base.py b/gitdb/base.py
index 5760b8a..42e71d0 100644
--- a/gitdb/base.py
+++ b/gitdb/base.py
@@ -19,7 +19,7 @@ __all__ = ('OInfo', 'OPackInfo', 'ODeltaPackInfo',
class OInfo(tuple):
- """Carries information about an object in an ODB, provding information
+ """Carries information about an object in an ODB, providing information
about the binary sha of the object, the type_string as well as the uncompressed size
in bytes.
@@ -29,7 +29,7 @@ class OInfo(tuple):
assert dbi[1] == dbi.type
assert dbi[2] == dbi.size
- The type is designed to be as lighteight as possible."""
+ The type is designed to be as lightweight as possible."""
__slots__ = tuple()
def __new__(cls, sha, type, size):
@@ -69,7 +69,7 @@ class OPackInfo(tuple):
does not include a sha.
Additionally, the pack_offset is the absolute offset into the packfile at which
- all object information is located. The data_offset property points to the abosolute
+ all object information is located. The data_offset property points to the absolute
location in the pack at which that actual data stream can be found."""
__slots__ = tuple()
diff --git a/gitdb/exc.py b/gitdb/exc.py
index 817ac7b..947e5d8 100644
--- a/gitdb/exc.py
+++ b/gitdb/exc.py
@@ -7,7 +7,6 @@ from gitdb.util import to_hex_sha
class ODBError(Exception):
-
"""All errors thrown by the object database"""
@@ -44,5 +43,4 @@ class BadObjectType(ODBError):
class UnsupportedOperation(ODBError):
-
"""Thrown if the given operation cannot be supported by the object database"""
diff --git a/gitdb/stream.py b/gitdb/stream.py
index 826def3..aaf5820 100644
--- a/gitdb/stream.py
+++ b/gitdb/stream.py
@@ -62,7 +62,7 @@ class DecompressMemMapReader(LazyMixin):
hence we try to find a good tradeoff between allocation time and number of
times we actually allocate. An own zlib implementation would be good here
to better support streamed reading - it would only need to keep the mmap
- and decompress it into chunks, thats all ... """
+ and decompress it into chunks, that's all ... """
__slots__ = ('_m', '_zip', '_buf', '_buflen', '_br', '_cws', '_cwe', '_s', '_close',
'_cbr', '_phi')
@@ -128,7 +128,7 @@ class DecompressMemMapReader(LazyMixin):
This method parses the object header from m and returns the parsed
type and size, as well as the created stream instance.
- :param m: memory map on which to oparate. It must be object data ( header + contents )
+ :param m: memory map on which to operate. It must be object data ( header + contents )
:param close_on_deletion: if True, the memory map will be closed once we are
being deleted"""
inst = DecompressMemMapReader(m, close_on_deletion, 0)
@@ -175,7 +175,7 @@ class DecompressMemMapReader(LazyMixin):
# Only scrub the stream forward if we are officially done with the
# bytes we were to have.
if self._br == self._s and not self._zip.unused_data:
- # manipulate the bytes-read to allow our own read method to coninute
+ # manipulate the bytes-read to allow our own read method to continue
# but keep the window at its current position
self._br = 0
if hasattr(self._zip, 'status'):
diff --git a/gitdb/util.py b/gitdb/util.py
index 8f80156..242be44 100644
--- a/gitdb/util.py
+++ b/gitdb/util.py
@@ -18,7 +18,7 @@ from smmap import (
# initialize our global memory manager instance
# Use it to free cached (and unused) resources.
-if sys.version_info[1] < 6:
+if sys.version_info < (2, 6):
mman = StaticWindowMapManager()
else:
mman = SlidingWindowMapManager()