From: David Stainton <dstainton415@gmail.com>
Date: Tue, 28 Apr 2015 08:32:34 +0000 (+0100)
Subject: Teach uploader to only unicode instead of utf-8
X-Git-Url: https://git.rkrishnan.org/frontends/specifications/reliability?a=commitdiff_plain;h=0570ff3d1f13fea33ccba560fed24f2e910a173b;p=tahoe-lafs%2Ftahoe-lafs.git

Teach uploader to only unicode instead of utf-8
---

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index f5a1bcbb..93a2d79f 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -103,14 +103,14 @@ class DropUploader(service.MultiService):
             if islink:
                 self.warn("WARNING: cannot backup symlink %s" % quote_local_unicode_path(childpath))
             elif isdir:
-                must_upload = self._check_db_file(childpath.decode('UTF-8'))
+                must_upload = self._check_db_file(childpath)
                 if must_upload:
                     self._append_to_deque(childpath)
 
                 # recurse on the child directory
                 self._scan(childpath)
             elif isfile:
-                must_upload = self._check_db_file(childpath.decode('UTF-8'))
+                must_upload = self._check_db_file(childpath)
                 if must_upload:
                     self._append_to_deque(childpath)
             else:
@@ -212,8 +212,7 @@ class DropUploader(service.MultiService):
                     size = s[stat.ST_SIZE]
                     ctime = s[stat.ST_CTIME]
                     mtime = s[stat.ST_MTIME]
-                    self._db.did_upload_file(filecap, path.decode('UTF-8'),
-                                             mtime, ctime, size)
+                    self._db.did_upload_file(filecap, path, mtime, ctime, size)
                 d.addCallback(add_db_entry)
                 self._stats_provider.count('drop_upload.files_uploaded', 1)
                 return None