diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-26 01:33:30 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-26 01:33:30 +0300 |
| commit | cdef59b761d57045069f73d399313ea256431ac7 (patch) | |
| tree | d21bea56f874517c6702961c5a6654725474e71f /Tools/freeze | |
| parent | 9a3c839867c75374dfc3ad1d36e34e61b17a009b (diff) | |
| parent | 4e8edc666b9e76e4db18b97fdfa9ea342f5a49f2 (diff) | |
| download | cpython-cdef59b761d57045069f73d399313ea256431ac7.tar.gz | |
#18803: merge with 3.3.
Diffstat (limited to 'Tools/freeze')
| -rw-r--r-- | Tools/freeze/bkfile.py | 4 | ||||
| -rwxr-xr-x | Tools/freeze/freeze.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tools/freeze/bkfile.py b/Tools/freeze/bkfile.py index 0e895f2816..58246fa2ad 100644 --- a/Tools/freeze/bkfile.py +++ b/Tools/freeze/bkfile.py @@ -7,11 +7,11 @@ class _BkFile: self.__backup = file + '~' try: os.unlink(self.__backup) - except os.error: + except OSError: pass try: os.rename(file, self.__backup) - except os.error: + except OSError: self.__backup = None self.__file = _orig_open(file, mode, bufsize) self.closed = self.__file.closed diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index a41267ae7d..479ca3c14b 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -125,7 +125,7 @@ def main(): # default the exclude list for each platform if win: exclude = exclude + [ 'dos', 'dospath', 'mac', 'macpath', 'macfs', 'MACFS', 'posix', - 'os2', 'ce', + 'ce', ] fail_import = exclude[:] @@ -311,7 +311,7 @@ def main(): try: os.mkdir(odir) print("Created output directory", odir) - except os.error as msg: + except OSError as msg: usage('%s: mkdir failed (%s)' % (odir, str(msg))) base = '' if odir: |