Skip to content

minor spell fixes + empty line unification + comparison for python 2.6 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gitdb/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

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.
Expand All @@ -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):
Expand Down Expand Up @@ -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()

Expand Down
2 changes: 0 additions & 2 deletions gitdb/exc.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@


class ODBError(Exception):

"""All errors thrown by the object database"""


Expand Down Expand Up @@ -44,5 +43,4 @@ class BadObjectType(ODBError):


class UnsupportedOperation(ODBError):

"""Thrown if the given operation cannot be supported by the object database"""
6 changes: 3 additions & 3 deletions gitdb/stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -128,7 +128,7 @@ def new(self, m, close_on_deletion=False):
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)
Expand Down Expand Up @@ -175,7 +175,7 @@ def compressed_bytes_read(self):
# 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'):
Expand Down
2 changes: 1 addition & 1 deletion gitdb/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# 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()
Expand Down