From 621e4e5ed5783339973351aed5c0b08c22936c55 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Thu, 16 Apr 2015 17:43:11 +0200
Subject: distinguish bytes from unicode for py3k

---
 dedup/compression.py | 2 +-
 dedup/hashing.py     | 2 +-
 dedup/image.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'dedup')

diff --git a/dedup/compression.py b/dedup/compression.py
index 4ce258c..4385f1d 100644
--- a/dedup/compression.py
+++ b/dedup/compression.py
@@ -62,7 +62,7 @@ class GzipDecompressor(object):
         else:
             expect = struct.pack("<ll", self.crc, self.size)
             if self.inbuffer.startswith(expect) and \
-                    self.inbuffer[len(expect):].replace("\0", "") == "":
+                    self.inbuffer[len(expect):].replace(b"\0", b"") == b"":
                 return b""
             return self.inbuffer
 
diff --git a/dedup/hashing.py b/dedup/hashing.py
index a8a46c7..0b7f889 100644
--- a/dedup/hashing.py
+++ b/dedup/hashing.py
@@ -52,7 +52,7 @@ class HashBlacklistContent(object):
             # the chain avoids passing the empty sequence to max
             maxlen = max(itertools.chain((0,), itertools.imap(len, blacklist)))
         self.maxlen = maxlen
-        self.stored = ""
+        self.stored = b""
 
     @property
     def name(self):
diff --git a/dedup/image.py b/dedup/image.py
index ef17989..314eb44 100644
--- a/dedup/image.py
+++ b/dedup/image.py
@@ -91,7 +91,7 @@ class GIFHash(ImageHash):
         if self.content.tell() < 10: # magic + logical dimension
             return False
         curvalue = self.content.getvalue()
-        if curvalue.startswith((b"GIF87a", "GIF89a")):
+        if curvalue.startswith((b"GIF87a", b"GIF89a")):
             width, height = struct.unpack("<HH", curvalue[6:10])
             if width * height > self.maxpixels:
                 raise ValueError("maximum image pixels exceeded")
-- 
cgit v1.2.3