summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dedup/hashing.py2
-rw-r--r--dedup/image.py2
-rwxr-xr-ximportpkg.py4
-rwxr-xr-xwebapp.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/dedup/hashing.py b/dedup/hashing.py
index 70f6268..a8a46c7 100644
--- a/dedup/hashing.py
+++ b/dedup/hashing.py
@@ -115,7 +115,7 @@ class DecompressedHash(object):
class SuppressingHash(object):
"""A hash that silences exceptions from the update and hexdigest methods of
- a hashlib-like object. If an exception has occured, hexdigest always
+ a hashlib-like object. If an exception has occurred, hexdigest always
returns None."""
def __init__(self, hashobj, exceptions=()):
"""
diff --git a/dedup/image.py b/dedup/image.py
index c1f2de0..ef17989 100644
--- a/dedup/image.py
+++ b/dedup/image.py
@@ -4,7 +4,7 @@ import struct
import PIL.Image
class ImageHash(object):
- """A hash on the contents of an image datat type supported by PIL. This
+ """A hash on the contents of an image data type supported by PIL. This
disregards mode, depth and meta information. Note that due to limitations
in PIL and the image format (interlacing) the full contents are stored and
decoded in hexdigest."""
diff --git a/importpkg.py b/importpkg.py
index cb16f97..aeccda5 100755
--- a/importpkg.py
+++ b/importpkg.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
-"""This tool reads a debian package from stdin and emits a yaml stream on
+"""This tool reads a Debian package from stdin and emits a yaml stream on
stdout. It does not access a database. Therefore it can be run in parallel and
-on multiple machines. The generated yaml conatins multiple documents. The first
+on multiple machines. The generated yaml contains multiple documents. The first
document contains package metadata. Then a document is emitted for each file.
And finally a document consisting of the string "commit" is emitted."""
diff --git a/webapp.py b/webapp.py
index fd6d685..2fd69bb 100755
--- a/webapp.py
+++ b/webapp.py
@@ -151,7 +151,7 @@ class Application(object):
return html_response(package_template.render(params))
def compute_comparison(self, pid1, pid2):
- """Compute a sequence of comparison objects ordery by the size of the
+ """Compute a sequence of comparison objects ordered by the size of the
object in the first package. Each element of the sequence is a dict
defining the following keys:
* filenames: A set of filenames in package 1 (pid1) all referring to