[Python-checkins] r80219 - in python/branches/py3k: Lib/shutil.py

[tarek.ziade]

Author: tarek.ziade
Date: Mon Apr 19 23:19:57 2010
New Revision: 80219

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/shutil.py

Modified: python/branches/py3k/Lib/shutil.py
==============================================================================
--- python/branches/py3k/Lib/shutil.py	(original)
+++ python/branches/py3k/Lib/shutil.py	Mon Apr 19 23:19:57 2010
@@ -53,7 +53,7 @@
 
 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 @@
         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):