From eb9358ff6de5cd23f47fe051b4694e7b88a0d96b Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Sat, 9 Jan 2010 09:49:56 -0800 Subject: [PATCH] =?utf8?q?contrib:=20fix=20fuse=5Fimpl=5Fc=20to=20use=20ne?= =?utf8?q?w=20Python=20API=20original=20patch=20by=20Thomas=20Delaet,=20fi?= =?utf8?q?xed=20by=20Fran=C3=A7ois,=20reviewed=20by=20Brian,=20committed?= =?utf8?q?=20by=20me?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- contrib/fuse/impl_c/blackmatch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/fuse/impl_c/blackmatch.py b/contrib/fuse/impl_c/blackmatch.py index 91379785..45296d7f 100644 --- a/contrib/fuse/impl_c/blackmatch.py +++ b/contrib/fuse/impl_c/blackmatch.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #----------------------------------------------------------------------------------------------- -from allmydata.uri import CHKFileURI, NewDirectoryURI, LiteralFileURI +from allmydata.uri import CHKFileURI, DirectoryURI, LiteralFileURI from allmydata.scripts.common_http import do_http as do_http_req from allmydata.util.hashutil import tagged_hash from allmydata.util.assertutil import precondition @@ -1093,7 +1093,7 @@ class TFS(object): cachedir = os.path.expanduser(os.path.join(nodedir, '_cache')) self.cache = FileCache(nodeurl, cachedir) - ro_uri = NewDirectoryURI.init_from_string(self.root_uri).get_readonly() + ro_uri = DirectoryURI.init_from_string(self.root_uri).get_readonly() self.root = Directory(self, ro_uri, self.root_uri) self.root.maybe_refresh('') @@ -1183,7 +1183,7 @@ class TFS(object): url = self.compose_url("uri?t=mkdir") new_dir_cap = do_http('PUT', url) - ro_uri = NewDirectoryURI.init_from_string(new_dir_cap).get_readonly() + ro_uri = DirectoryURI.init_from_string(new_dir_cap).get_readonly() child = Directory(self, ro_uri, new_dir_cap) parent.add_child(name, child, {}) @@ -1599,7 +1599,7 @@ def main(argv): root_name = 'uri_' + base32.b2a(tagged_hash('root_name', root_uri))[:12] # test the uri for structural validity: try: - NewDirectoryURI.init_from_string(root_uri) + DirectoryURI.init_from_string(root_uri) except: raise usage.error('root-uri must be a valid directory uri (not %r)' % (root_uri,)) else: -- 2.45.2