[Python-checkins] r58235 - in sandbox/trunk/import_in_py: Py3K/_importlib.py Py3K/importlib.py _importlib.py importlib.py

[brett.cannon]

Author: brett.cannon
Date: Sun Sep 23 01:07:40 2007
New Revision: 58235

Modified:
   sandbox/trunk/import_in_py/Py3K/_importlib.py
   sandbox/trunk/import_in_py/Py3K/importlib.py
   sandbox/trunk/import_in_py/_importlib.py
   sandbox/trunk/import_in_py/importlib.py
Log:
Use the errno module instead of a single attribute.


Modified: sandbox/trunk/import_in_py/Py3K/_importlib.py
==============================================================================
--- sandbox/trunk/import_in_py/Py3K/_importlib.py	(original)
+++ sandbox/trunk/import_in_py/Py3K/_importlib.py	Sun Sep 23 01:07:40 2007
@@ -59,9 +59,9 @@
 """
 from __future__ import with_statement
 
-# Injected modules are 'warnings', 'imp', 'sys', 'marshal', and '_os'
+# Injected modules are 'warnings', 'imp', 'sys', 'marshal', 'errno', and '_os'
 # (a.k.a. 'posix', 'nt' or 'os2').
-# Injected attributes are path_sep and EACCES.
+# Injected attribute is path_sep.
 # XXX Temporarily injected functions are _r_long, _w_long, and _case_ok.
 
 
@@ -509,7 +509,7 @@
                 bytecode_file.write(data)
                 return True
         except IOError as exc:
-            if exc.errno == EACCES:
+            if exc.errno == errno.EACCES:
                 return False
             else:
                 raise

Modified: sandbox/trunk/import_in_py/Py3K/importlib.py
==============================================================================
--- sandbox/trunk/import_in_py/Py3K/importlib.py	(original)
+++ sandbox/trunk/import_in_py/Py3K/importlib.py	Sun Sep 23 01:07:40 2007
@@ -112,27 +112,23 @@
         except ImportError:
             raise ImportError('posix, nt, or os2 module required for importlib')
 _importlib._os = _os
-import imp, sys, marshal
+import imp, sys, marshal, errno
 _importlib.imp = imp
 _importlib.sys = sys
 _importlib.marshal = marshal
+_importlib.errno = errno
+# XXX 'warnings' needs become a built-in module (<cough>Neal</cough>).
+import warnings
+_importlib.warnings = warnings
 
 
-# XXX These all need to either go away or become built-in modules
-# (<cough>Neal</cough>).
-from errno import EACCES
 from os import sep
-import warnings
-
 _importlib._r_long = _r_long  #XXX Expose original from marshal.
 _importlib._w_long = _w_long  #XXX Expose original from marshal.
 _importlib._case_ok = _case_ok  #XXX Expose original from imp.
 # For os.path.join replacement; pull from Include/osdefs.h:SEP .
 _importlib.path_sep = sep
-# For allowing silent failure of .pyc creation when permission is denied.
-_importlib.EACCES = EACCES
 
-_importlib.warnings = warnings
 
 del _importlib
 

Modified: sandbox/trunk/import_in_py/_importlib.py
==============================================================================
--- sandbox/trunk/import_in_py/_importlib.py	(original)
+++ sandbox/trunk/import_in_py/_importlib.py	Sun Sep 23 01:07:40 2007
@@ -59,9 +59,9 @@
 """
 from __future__ import with_statement
 
-# Injected modules are 'warnings', 'imp', 'sys', 'marshal', and '_os'
+# Injected modules are 'warnings', 'imp', 'sys', 'marshal', 'errno', and '_os'
 # (a.k.a. 'posix', 'nt' or 'os2').
-# Injected attributes are path_sep and EACCES.
+# Injected attribute is path_sep.
 # XXX Temporarily injected functions are _r_long, _w_long, and _case_ok.
 
 
@@ -509,7 +509,7 @@
                 bytecode_file.write(data)
                 return True
         except IOError as exc:
-            if exc.errno == EACCES:
+            if exc.errno == errno.EACCES:
                 return False
             else:
                 raise

Modified: sandbox/trunk/import_in_py/importlib.py
==============================================================================
--- sandbox/trunk/import_in_py/importlib.py	(original)
+++ sandbox/trunk/import_in_py/importlib.py	Sun Sep 23 01:07:40 2007
@@ -112,27 +112,23 @@
         except ImportError:
             raise ImportError('posix, nt, or os2 module required for importlib')
 _importlib._os = _os
-import imp, sys, marshal
+import imp, sys, marshal, errno
 _importlib.imp = imp
 _importlib.sys = sys
 _importlib.marshal = marshal
+_importlib.errno = errno
+# XXX 'warnings' needs become a built-in module (<cough>Neal</cough>).
+import warnings
+_importlib.warnings = warnings
 
 
-# XXX These all need to either go away or become built-in modules
-# (<cough>Neal</cough>).
-from errno import EACCES
 from os import sep
-import warnings
-
 _importlib._r_long = _r_long  #XXX Expose original from marshal.
 _importlib._w_long = _w_long  #XXX Expose original from marshal.
 _importlib._case_ok = _case_ok  #XXX Expose original from imp.
 # For os.path.join replacement; pull from Include/osdefs.h:SEP .
 _importlib.path_sep = sep
-# For allowing silent failure of .pyc creation when permission is denied.
-_importlib.EACCES = EACCES
 
-_importlib.warnings = warnings
 
 del _importlib