Changeset 2a79252a in trunk


Ignore:
Timestamp:
2016-07-21T19:35:59Z (9 years ago)
Author:
Brian Warner <warner@…>
Branches:
master
Children:
6fb7f86
Parents:
45adc30e
git-author:
Daira Hopwood <daira@…> (2015-10-23 21:02:09)
git-committer:
Brian Warner <warner@…> (2016-07-21 19:35:59)
Message:

Fix some path Unixisms.

Signed-off-by: Daira Hopwood <daira@…>

Location:
src/allmydata
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified src/allmydata/frontends/magic_folder.py

    r45adc30e r2a79252a  
    182182        self._upload_dirnode = self._client.create_node_from_uri(upload_dircap)
    183183        if not IDirectoryNode.providedBy(self._upload_dirnode):
    184             raise AssertionError("The URI in 'private/magic_folder_dircap' does not refer to a directory.")
     184            raise AssertionError("The URI in '%s' does not refer to a directory."
     185                                 % os.path.join('private', 'magic_folder_dircap'))
    185186        if self._upload_dirnode.is_unknown() or self._upload_dirnode.is_readonly():
    186             raise AssertionError("The URI in 'private/magic_folder_dircap' is not a writecap to a directory.")
     187            raise AssertionError("The URI in '%s' is not a writecap to a directory."
     188                                 % os.path.join('private', 'magic_folder_dircap'))
    187189
    188190        self._inotify = get_inotify_module()
     
    501503
    502504        if not IDirectoryNode.providedBy(self._collective_dirnode):
    503             raise AssertionError("The URI in 'private/collective_dircap' does not refer to a directory.")
     505            raise AssertionError("The URI in '%s' does not refer to a directory."
     506                                 % os.path.join('private', 'collective_dircap'))
    504507        if self._collective_dirnode.is_unknown() or not self._collective_dirnode.is_readonly():
    505             raise AssertionError("The URI in 'private/collective_dircap' is not a readonly cap to a directory.")
     508            raise AssertionError("The URI in '%s' is not a readonly cap to a directory."
     509                                 % os.path.join('private', 'collective_dircap'))
    506510
    507511        self._turn_delay = self.REMOTE_SCAN_INTERVAL
  • TabularUnified src/allmydata/scripts/create_node.py

    r45adc30e r2a79252a  
    141141    c.write("enabled = false\n")
    142142    c.write("# To specify the target of uploads, a mutable directory writecap URI must be placed\n"
    143             "# in 'private/drop_upload_dircap'.\n")
     143            "# in '%s'.\n" % os.path.join('private', 'magic_folder_dircap'))
    144144    c.write("local.directory = ~/drop_upload\n")
    145145    c.write("\n")
  • TabularUnified src/allmydata/scripts/magic_folder_cli.py

    r45adc30e r2a79252a  
    146146    magic_readonly_cap, dmd_write_cap = fields
    147147
    148     dmd_cap_file = os.path.join(options["node-directory"], "private/magic_folder_dircap")
    149     collective_readcap_file = os.path.join(options["node-directory"], "private/collective_dircap")
     148    dmd_cap_file = os.path.join(options["node-directory"], u"private", u"magic_folder_dircap")
     149    collective_readcap_file = os.path.join(options["node-directory"], u"private", u"collective_dircap")
    150150
    151151    fileutil.write(dmd_cap_file, dmd_write_cap)
    152152    fileutil.write(collective_readcap_file, magic_readonly_cap)
    153     fileutil.write(os.path.join(options["node-directory"], "tahoe.cfg"),
     153    fileutil.write(os.path.join(options["node-directory"], u"tahoe.cfg"),
    154154                   "[magic_folder]\nenabled = True\nlocal.directory = %s\n"
    155155                   % (options.local_dir.encode('utf-8'),), mode="ab")
  • TabularUnified src/allmydata/test/test_cli_magic_folder.py

    r45adc30e r2a79252a  
    5858        our upload directory.
    5959        """
    60         collective_readonly_cap = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "private/collective_dircap"))
     60        collective_readonly_cap = fileutil.read(os.path.join(self.get_clientdir(i=client_num),
     61                                                             u"private", u"collective_dircap"))
    6162        d = self.do_cli("ls", "--json", collective_readonly_cap, client_num=client_num)
    6263        def _done((rc, stdout, stderr)):
     
    7374
    7475    def get_caps_from_files(self, client_num):
    75         collective_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "private/collective_dircap"))
    76         upload_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num), "private/magic_folder_dircap"))
     76        collective_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num),
     77                                                       u"private", u"collective_dircap"))
     78        upload_dircap = fileutil.read(os.path.join(self.get_clientdir(i=client_num),
     79                                                   u"private", u"magic_folder_dircap"))
    7780        self.failIf(collective_dircap is None or upload_dircap is None)
    7881        return collective_dircap, upload_dircap
  • TabularUnified src/allmydata/test/test_magic_folder.py

    r45adc30e r2a79252a  
    910910                            MagicFolder, client, readonly_dircap, '', errors_dir, magicfolderdb,)
    911911            self.shouldFail(AssertionError, 'collective dircap',
    912                             "The URI in 'private/collective_dircap' is not a readonly cap to a directory.",
     912                            "The URI in '%s' is not a readonly cap to a directory." % os.path.join('private', 'collective_dircap'),
    913913                            MagicFolder, client, upload_dircap, upload_dircap, errors_dir, magicfolderdb)
    914914
Note: See TracChangeset for help on using the changeset viewer.