Merge pull request #6818 from blueyed/fix-assert-exc-upstream
assertion: rewrite: only catch EnvironmentError
This commit is contained in:
		
						commit
						83e18776f6
					
				| 
						 | 
				
			
			@ -285,7 +285,7 @@ if sys.platform == "win32":
 | 
			
		|||
            with atomic_write(fspath(pyc), mode="wb", overwrite=True) as fp:
 | 
			
		||||
                _write_pyc_fp(fp, source_stat, co)
 | 
			
		||||
        except EnvironmentError as e:
 | 
			
		||||
            state.trace("error writing pyc file at {}: errno={}".format(pyc, e.errno))
 | 
			
		||||
            state.trace("error writing pyc file at {}: {}".format(pyc, e))
 | 
			
		||||
            # we ignore any failure to write the cache file
 | 
			
		||||
            # there are many reasons, permission-denied, pycache dir being a
 | 
			
		||||
            # file etc.
 | 
			
		||||
| 
						 | 
				
			
			@ -308,8 +308,8 @@ else:
 | 
			
		|||
        try:
 | 
			
		||||
            _write_pyc_fp(fp, source_stat, co)
 | 
			
		||||
            os.rename(proc_pyc, fspath(pyc))
 | 
			
		||||
        except BaseException as e:
 | 
			
		||||
            state.trace("error writing pyc file at {}: errno={}".format(pyc, e.errno))
 | 
			
		||||
        except EnvironmentError as e:
 | 
			
		||||
            state.trace("error writing pyc file at {}: {}".format(pyc, e))
 | 
			
		||||
            # we ignore any failure to write the cache file
 | 
			
		||||
            # there are many reasons, permission-denied, pycache dir being a
 | 
			
		||||
            # file etc.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue