From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sat, 9 Jan 2010 17:49:56 +0000 (-0800)
Subject: contrib: fix fuse_impl_c to use new Python API
X-Git-Tag: trac-4200~49
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20//%22?a=commitdiff_plain;h=eb9358ff6de5cd23f47fe051b4694e7b88a0d96b;p=tahoe-lafs%2Ftahoe-lafs.git

contrib: fix fuse_impl_c to use new Python API
original patch by Thomas Delaet, fixed by François, reviewed by Brian, committed by me
---

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('<root>')
 
@@ -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: