mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	Fixed a missing exception (WindowsError) when using the rmtree error handler on non-Windows systems.
				
					
				
			git-svn-id: http://code.djangoproject.com/svn/django/trunk@17247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
		| @@ -3,11 +3,18 @@ import stat | ||||
| from os.path import join, normcase, normpath, abspath, isabs, sep | ||||
| from django.utils.encoding import force_unicode | ||||
|  | ||||
| # Define our own abspath function that can handle joining  | ||||
| try: | ||||
|     WindowsError = WindowsError | ||||
| except NameError: | ||||
|     class WindowsError(Exception): | ||||
|         pass | ||||
|  | ||||
|  | ||||
| # Define our own abspath function that can handle joining | ||||
| # unicode paths to a current working directory that has non-ASCII | ||||
| # characters in it.  This isn't necessary on Windows since the  | ||||
| # characters in it.  This isn't necessary on Windows since the | ||||
| # Windows version of abspath handles this correctly.  The Windows | ||||
| # abspath also handles drive letters differently than the pure  | ||||
| # abspath also handles drive letters differently than the pure | ||||
| # Python implementation, so it's best not to replace it. | ||||
| if os.name == 'nt': | ||||
|     abspathu = abspath | ||||
| @@ -45,6 +52,7 @@ def safe_join(base, *paths): | ||||
|                          'path component (%s)' % (final_path, base_path)) | ||||
|     return final_path | ||||
|  | ||||
|  | ||||
| def rmtree_errorhandler(func, path, exc_info): | ||||
|     """ | ||||
|     On Windows, some files are read-only (e.g. in in .svn dirs), so when | ||||
|   | ||||
		Reference in New Issue
	
	Block a user