summaryrefslogtreecommitdiff
path: root/fs/ftpfs.py
diff options
context:
space:
mode:
authorrfkelly0 <rfkelly0@67cdc799-7952-0410-af00-57a81ceafa0f>2010-09-07 12:17:05 +0000
committerrfkelly0 <rfkelly0@67cdc799-7952-0410-af00-57a81ceafa0f>2010-09-07 12:17:05 +0000
commita48ad3bc52a81353cc799d8666e236e7c471cf57 (patch)
treef3e7581377622b2d9e43c31dd892e0150c5af8c4 /fs/ftpfs.py
parent7b28a3b2030642588e9c826adf22dd9bae306e17 (diff)
downloadpyfilesystem-a48ad3bc52a81353cc799d8666e236e7c471cf57.tar.gz
rename "functools" to "local_functools".
It can't have the same name as the module it's trying to emulate. Python's local-imports-first rule means it would shadow the stdlib functools module and we would always get the fallback version. git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@421 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs/ftpfs.py')
-rw-r--r--fs/ftpfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ftpfs.py b/fs/ftpfs.py
index 4e1f63d..2057d54 100644
--- a/fs/ftpfs.py
+++ b/fs/ftpfs.py
@@ -27,7 +27,7 @@ from time import sleep
import datetime
import re
from socket import error as socket_error
-from fs.functools import wraps
+from fs.local_functools import wraps
try:
from cStringIO import StringIO