summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-04-19 21:19:57 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-04-19 21:19:57 (GMT)
commit1eab9ccd0d12d9c65c38cd4c8aa8d90909199bda (patch)
tree7a7baf6de21c74f4b9828e946c25e429bb015b9f
parent7afbcc0f63c52de174d79a28d2b6e1916f8fe46b (diff)
downloadcpython-1eab9ccd0d12d9c65c38cd4c8aa8d90909199bda.zip
cpython-1eab9ccd0d12d9c65c38cd4c8aa8d90909199bda.tar.gz
cpython-1eab9ccd0d12d9c65c38cd4c8aa8d90909199bda.tar.bz2
Merged revisions 80218 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80218 | tarek.ziade | 2010-04-19 23:13:03 +0200 (Mon, 19 Apr 2010) | 1 line few pep8 fixes ........
-rw-r--r--Lib/shutil.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 98b7ea0..6688119 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -53,7 +53,7 @@ def copyfileobj(fsrc, fdst, length=16*1024):
def _samefile(src, dst):
# Macintosh, Unix.
- if hasattr(os.path,'samefile'):
+ if hasattr(os.path, 'samefile'):
try:
return os.path.samefile(src, dst)
except OSError:
@@ -109,7 +109,8 @@ def copystat(src, dst):
try:
os.chflags(dst, st.st_flags)
except OSError as why:
- if not hasattr(errno, 'EOPNOTSUPP') or why.errno != errno.EOPNOTSUPP:
+ if (not hasattr(errno, 'EOPNOTSUPP') or
+ why.errno != errno.EOPNOTSUPP):
raise
def copy(src, dst):