summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/contrib/tahoelafs/test_tahoelafs.py6
-rw-r--r--fs/opener.py2
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/contrib/tahoelafs/test_tahoelafs.py b/fs/contrib/tahoelafs/test_tahoelafs.py
index e80fd1b..8912761 100644
--- a/fs/contrib/tahoelafs/test_tahoelafs.py
+++ b/fs/contrib/tahoelafs/test_tahoelafs.py
@@ -12,17 +12,17 @@ import unittest
from fs.base import FS
import fs.errors as errors
from fs.tests import FSTestCases, ThreadingTestCases
-from fs.contrib.tahoefs import TahoeLAFS, Connection
+from fs.contrib.tahoelafs import TahoeLAFS, Connection
logging.getLogger().setLevel(logging.DEBUG)
-logging.getLogger('fs.tahoefs').addHandler(logging.StreamHandler(sys.stdout))
+logging.getLogger('fs.tahoelafs').addHandler(logging.StreamHandler(sys.stdout))
WEBAPI = 'http://pubgrid.tahoe-lafs.org'
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)
diff --git a/fs/opener.py b/fs/opener.py
index 42ad7b3..fccc125 100644
--- a/fs/opener.py
+++ b/fs/opener.py
@@ -571,7 +571,7 @@ class TahoeOpener(Opener):
@classmethod
def get_fs(cls, registry, fs_name, fs_name_params, fs_path, writeable, create_dir):
- from fs.contrib.tahoefs import TahoeLAFS
+ from fs.contrib.tahoelafs import TahoeLAFS
if '/uri/' not in fs_path:
raise OpenerError("""Tahoe-LAFS url should be in the form <url>/uri/<dicap>""")
diff --git a/setup.py b/setup.py
index 16c5657..bf27a84 100644
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ setup(name='fs',
'fs.contrib',
'fs.contrib.bigfs',
'fs.contrib.davfs',
- 'fs.contrib.tahoefs',
+ 'fs.contrib.tahoelafs',
'fs.commands'],
scripts=['fs/commands/%s' % command for command in COMMANDS],
classifiers=classifiers,