summaryrefslogtreecommitdiff
path: root/fs/ftpfs.py
diff options
context:
space:
mode:
authorwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2010-07-10 15:29:54 +0000
committerwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2010-07-10 15:29:54 +0000
commitfb95d7bef7a67a927bb66d0bfc8598650c05f04f (patch)
tree147b4384eab2e22779e5cc6e1c4219b27f797e73 /fs/ftpfs.py
parent8a504419216d4862a948f2dfce3f058aec74d958 (diff)
downloadpyfilesystem-git-fb95d7bef7a67a927bb66d0bfc8598650c05f04f.tar.gz
Added better zip exceptions, and added __all__ to core classes
Diffstat (limited to 'fs/ftpfs.py')
-rw-r--r--fs/ftpfs.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ftpfs.py b/fs/ftpfs.py
index 50cd882..4e1f63d 100644
--- a/fs/ftpfs.py
+++ b/fs/ftpfs.py
@@ -10,7 +10,8 @@ __all__ = ['FTPFS']
import fs
from fs.base import *
-from fs.path import pathsplit
+from fs.errors import *
+from fs.path import pathsplit, abspath, dirname, recursepath, normpath
from ftplib import FTP, error_perm, error_temp, error_proto, error_reply
@@ -26,10 +27,7 @@ from time import sleep
import datetime
import re
from socket import error as socket_error
-try:
- from functools import wraps
-except ImportError:
- wraps = lambda f: lambda f: f
+from fs.functools import wraps
try:
from cStringIO import StringIO