| 1 | --- /home/thomas/Download/allmydata-tahoe-1.5.0/contrib/fuse/impl_c/blackmatch.py 2009-02-23 19:31:00.000000000 +0100 |
|---|
| 2 | +++ tahoe.py 2009-09-22 23:47:56.000000000 +0200 |
|---|
| 3 | @@ -1,7 +1,7 @@ |
|---|
| 4 | #!/usr/bin/env python |
|---|
| 5 | |
|---|
| 6 | #----------------------------------------------------------------------------------------------- |
|---|
| 7 | -from allmydata.uri import CHKFileURI, NewDirectoryURI, LiteralFileURI |
|---|
| 8 | +from allmydata.uri import CHKFileURI, DirectoryURI, LiteralFileURI |
|---|
| 9 | from allmydata.scripts.common_http import do_http as do_http_req |
|---|
| 10 | from allmydata.util.hashutil import tagged_hash |
|---|
| 11 | from allmydata.util.assertutil import precondition |
|---|
| 12 | @@ -1093,7 +1093,7 @@ |
|---|
| 13 | |
|---|
| 14 | cachedir = os.path.expanduser(os.path.join(nodedir, '_cache')) |
|---|
| 15 | self.cache = FileCache(nodeurl, cachedir) |
|---|
| 16 | - ro_uri = NewDirectoryURI.init_from_string(self.root_uri).get_readonly() |
|---|
| 17 | + ro_uri = DirectoryURI.init_from_string(self.root_uri).get_readonly() |
|---|
| 18 | self.root = Directory(self, ro_uri, self.root_uri) |
|---|
| 19 | self.root.maybe_refresh('<root>') |
|---|
| 20 | |
|---|
| 21 | @@ -1183,7 +1183,7 @@ |
|---|
| 22 | url = self.compose_url("uri?t=mkdir") |
|---|
| 23 | new_dir_cap = do_http('PUT', url) |
|---|
| 24 | |
|---|
| 25 | - ro_uri = NewDirectoryURI.init_from_string(new_dir_cap).get_readonly() |
|---|
| 26 | + ro_uri = DirectoryURI.init_from_string(new_dir_cap).get_readonly() |
|---|
| 27 | child = Directory(self, ro_uri, new_dir_cap) |
|---|
| 28 | parent.add_child(name, child, {}) |
|---|
| 29 | |
|---|
| 30 | @@ -1598,10 +1598,10 @@ |
|---|
| 31 | root_uri = config['root-uri'] |
|---|
| 32 | root_name = 'uri_' + base32.b2a(tagged_hash('root_name', root_uri))[:12] |
|---|
| 33 | # test the uri for structural validity: |
|---|
| 34 | - try: |
|---|
| 35 | - NewDirectoryURI.init_from_string(root_uri) |
|---|
| 36 | - except: |
|---|
| 37 | - raise usage.error('root-uri must be a valid directory uri (not %r)' % (root_uri,)) |
|---|
| 38 | + #try: |
|---|
| 39 | + # DirectoryURI.init_from_string(root_uri) |
|---|
| 40 | + #except: |
|---|
| 41 | + # raise usage.error('root-uri must be a valid directory uri (not %r)' % (root_uri,)) |
|---|
| 42 | else: |
|---|
| 43 | raise usage.error('At least one of --alias or --root-uri must be specified') |
|---|
| 44 | |
|---|
