summaryrefslogtreecommitdiff
path: root/fs/ftpfs.py
diff options
context:
space:
mode:
authorwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2011-12-27 16:50:20 +0000
committerwillmcgugan <willmcgugan@67cdc799-7952-0410-af00-57a81ceafa0f>2011-12-27 16:50:20 +0000
commit3b900b1c11d9b5fc247b9fdf6461bceea47e7950 (patch)
tree5c43bc973942a1c49f65a9d9a5edf468354753dc /fs/ftpfs.py
parent754fcc98df0d379a92c7b9741505c257e09a532f (diff)
downloadpyfilesystem-git-3b900b1c11d9b5fc247b9fdf6461bceea47e7950.tar.gz
Python3 compatibility
Diffstat (limited to 'fs/ftpfs.py')
-rw-r--r--fs/ftpfs.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/ftpfs.py b/fs/ftpfs.py
index 719e2d3..7632230 100644
--- a/fs/ftpfs.py
+++ b/fs/ftpfs.py
@@ -29,10 +29,16 @@ import calendar
from socket import error as socket_error
from fs.local_functools import wraps
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
+import six
+from six import PY3
+
+if PY3:
+ from six import BytesIO as StringIO
+else:
+ try:
+ from cStringIO import StringIO
+ except ImportError:
+ from StringIO import StringIO
import time