diff options
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/mailbox.py | 28 | ||||
| -rw-r--r-- | Lib/tempfile.py | 4 |
2 files changed, 0 insertions, 32 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index 2d3553ab4b..bb115e180f 100755 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -24,12 +24,6 @@ __all__ = [ 'Mailbox', 'Maildir', 'mbox', 'MH', 'Babyl', 'MMDF', 'BabylMessage', 'MMDFMessage', 'UnixMailbox', 'PortableUnixMailbox', 'MmdfMailbox', 'MHMailbox', 'BabylMailbox' ] -if sys.platform != 'win32': - # Define WindowsError so that we can use it in an except statement - # even on non-Windows systems - class WindowsError: - pass - class Mailbox: """A group of messages in a particular place.""" @@ -268,9 +262,6 @@ class Maildir(Mailbox): self.remove(key) except KeyError: pass - except WindowsError, e: - if e.errno != 2: # ERROR_FILE_NOT_FOUND - raise except OSError, e: if e.errno != errno.ENOENT: raise @@ -426,12 +417,6 @@ class Maildir(Mailbox): path = os.path.join(self._path, 'tmp', uniq) try: os.stat(path) - except WindowsError, e: - if e.errno == 2: # ERROR_FILE_NOT_FOUND - Maildir._count += 1 - return open(path, 'wb+') - else: - raise except OSError, e: if e.errno == errno.ENOENT: Maildir._count += 1 @@ -579,12 +564,6 @@ class _singlefileMailbox(Mailbox): self._file.close() try: os.rename(new_file.name, self._path) - except WindowsError, e: - if e.errno == 183: # ERROR_ALREADY_EXISTS - os.remove(self._path) - os.rename(new_file.name, self._path) - else: - raise except OSError, e: if e.errno == errno.EEXIST: os.remove(self._path) @@ -1856,13 +1835,6 @@ def _lock_file(f, dotlock=True): else: os.rename(pre_lock.name, f.name + '.lock') dotlock_done = True - except WindowsError, e: - if e.errno == 183: # ERROR_ALREADY_EXISTS - os.remove(pre_lock.name) - raise ExternalClashError('dot lock unavailable: %s' % - f.name) - else: - raise except OSError, e: if e.errno == errno.EEXIST: os.remove(pre_lock.name) diff --git a/Lib/tempfile.py b/Lib/tempfile.py index 83dfa171db..dd7e8643e6 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -327,10 +327,6 @@ def mkdtemp(suffix="", prefix=template, dir=None): try: _os.mkdir(file, 0700) return file - except WindowsError, e: - if e.errno == 183: # ERROR_ALREADY_EXISTS - continue # try again - raise except OSError, e: if e.errno == _errno.EEXIST: continue # try again |