Merge pull request #489 from exarkun/magic-folder-cleanups

Make some trivial magic-folder-related code/doc improvements.

docs/proposed/magic-folder/filesystem-integration.rst

@@ -62,13 +62,15 @@ to the target folder cease for a sufficiently long period of time.
 
 *Detecting filesystem changes*
 
-For the Linux implementation, we will use the inotify Linux kernel
+For the Linux implementation, we will use the `inotify`_ Linux kernel
 subsystem to gather events on the local Magic Folder directory tree. This
 implementation was already present in Tahoe-LAFS 1.9.0, but needs to be
 changed to gather directory creation and move events, in addition to the
 events indicating that a file has been written that are gathered by the
 current code.
 
+.. _`inotify`: https://en.wikipedia.org/wiki/Inotify
+
 For the Windows implementation, we will use the ``ReadDirectoryChangesW``
 Win32 API. The prototype implementation simulates a Python interface to
 the inotify API in terms of ``ReadDirectoryChangesW``, allowing most of

src/allmydata/client.py

@@ -602,8 +602,8 @@ class _Client(node.Node, pollmixin.PollMixin):
 
                 s = magic_folder.MagicFolder(
                     client=self,
-                    upload_dircap=mf_config["upload_dircap"].encode('ascii'),
-                    collective_dircap=mf_config["collective_dircap"].encode('ascii'),
+                    upload_dircap=mf_config["upload_dircap"],
+                    collective_dircap=mf_config["collective_dircap"],
                     local_path_u=abspath_expanduser_unicode(local_dir_config, base=self.basedir),
                     dbfile=abspath_expanduser_unicode(db_filename),
                     umask=self.get_config("magic_folder", "download.umask", 0077),