small doc tweaks

git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@650 67cdc799-7952-0410-af00-57a81ceafa0f

2 files changed, 19 insertions, 8 deletions

diff --git a/fs/contrib/tahoelafs/__init__.py b/fs/contrib/tahoelafs/__init__.py
index d8b9f0d..0876f0e 100644
--- a/fs/contrib/tahoelafs/__init__.py
+++ b/fs/contrib/tahoelafs/__init__.py
@@ -2,13 +2,21 @@
 fs.contrib.tahoelafs

 ====================

 

-Example (it will use publicly available, but slow-as-hell Tahoe-LAFS cloud)::

+This modules provides a PyFilesystem interface to the Tahoe Least Authority

+File System. Tahoe-LAFS is a distributed, encrypted, fault-tolerant storage

+system:

+

+    http://tahoe-lafs.org/

+

+You will need access to a Tahoe-LAFS "web api" service.

+

+Example (it will use publicly available (but slow) Tahoe-LAFS cloud)::

 

     from fs.contrib.tahoelafs import TahoeLAFS, Connection

-    dircap = TahoeLAFS.createdircap(webapi='http://pubgrid.tahoe-lafs.org')

+    dircap = TahoeLAFS.createdircap(webapi='http://insecure.tahoe-lafs.org')

     print "Your dircap (unique key to your storage directory) is", dircap

     print "Keep it safe!"

-    fs = TahoeLAFS(dircap, autorun=False, timeout=300, webapi='http://pubgrid.tahoe-lafs.org')

+    fs = TahoeLAFS(dircap, autorun=False, webapi='http://insecure.tahoe-lafs.org')

     f = fs.open("foo.txt", "a")

     f.write('bar!')

     f.close()

@@ -296,7 +304,7 @@ class _TahoeLAFS(FS):
         self.tahoeutil.mkdir(self.dircap, path)

         

     def movedir(self, src, dst, overwrite=False):

-        self.move(src, dst, overwrite)

+        self.move(src, dst, overwrite=overwrite)

     

     def move(self, src, dst, overwrite=False):

         self._log(INFO, "Moving file from %s to %s" % (src, dst))

diff --git a/fs/contrib/tahoelafs/test_tahoelafs.py b/fs/contrib/tahoelafs/test_tahoelafs.py
index 8912761..e4521c3 100644
--- a/fs/contrib/tahoelafs/test_tahoelafs.py
+++ b/fs/contrib/tahoelafs/test_tahoelafs.py
@@ -17,16 +17,19 @@ from fs.contrib.tahoelafs import TahoeLAFS, Connection
 logging.getLogger().setLevel(logging.DEBUG)

 logging.getLogger('fs.tahoelafs').addHandler(logging.StreamHandler(sys.stdout))

 

-WEBAPI = 'http://pubgrid.tahoe-lafs.org'

+WEBAPI = 'http://insecure.tahoe-lafs.org'

 

-class TestTahoeLAFS(unittest.TestCase,FSTestCases,ThreadingTestCases):

+

+#  The public grid is too slow for threading testcases, disabling for now...

+class TestTahoeLAFS(unittest.TestCase,FSTestCases):#,ThreadingTestCases):

 

     #  Disabled by default because it takes a *really* long time.

-    #__test__ = False

+    __test__ = False

 

     def setUp(self):

         self.dircap = TahoeLAFS.createdircap(WEBAPI)

-        self.fs = TahoeLAFS(self.dircap, timeout=0, webapi=WEBAPI)

+        print TahoeLAFS.__mro__

+        self.fs = TahoeLAFS(self.dircap, cache_timeout=0, webapi=WEBAPI)

              

     def tearDown(self):

         self.fs.close()