Lib/shutil.py - Issue 2384: Remove WindowsError reference on non-windows systems

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Enter> :	respond to / edit current comment

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s :	save comment
<Esc> :	cancel edit

Unified Diff: Lib/shutil.py

Issue 2384: Remove WindowsError reference on non-windows systems (Closed) SVN Base: http://svn.python.org/view/*checkout*/python/trunk/

Patch Set: A slight mistake corrected. Created 1 year, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.

Jump to:

« no previous file | no next file » | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Lib/shutil.py

===================================================================

--- Lib/shutil.py (revision 64406)

+++ Lib/shutil.py (working copy)

@@ -15,6 +15,11 @@

class Error(EnvironmentError):

pass

+try:

+ WindowsError

+except NameError:

+ WindowsError = None

def copyfileobj(fsrc, fdst, length=16*1024):

"""copy data from file-like object fsrc to file-like object fdst"""

while 1:

@@ -131,11 +136,12 @@

errors.extend(err.args[0])

try:

copystat(src, dst)

- except WindowsError:

- # can't copy file access times on Windows

- pass

except OSError, why:

- errors.extend((src, dst, str(why)))

+ if WindowsError is not None and isinstance(why, WindowsError):

+ # Copying file access times may fail on Windows

+ pass

+ else:

+ errors.extend((src, dst, str(why)))

if errors:

raise Error, errors

« no previous file | no next file »