From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Mon, 19 Apr 2010 21:19:57 +0000 (+0000)
Subject: Merged revisions 80218 via svnmerge from
X-Git-Tag: v3.2a1~1099
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1eab9ccd0d12d9c65c38cd4c8aa8d90909199bda;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 98b7ea0060f8..6688119bde4c 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):