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

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):