[Python-checkins] r84196 - in python/branches/release31-maint: Lib/imaplib.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Thu Aug 19 09:04:27 2010
New Revision: 84196

Log:
Merged revisions 84195 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84195 | senthil.kumaran | 2010-08-19 12:32:20 +0530 (Thu, 19 Aug 2010) | 3 lines
  
  Fix Issue9638 - remove dead code from py3k imaplib
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/imaplib.py

Modified: python/branches/release31-maint/Lib/imaplib.py
==============================================================================
--- python/branches/release31-maint/Lib/imaplib.py	(original)
+++ python/branches/release31-maint/Lib/imaplib.py	Thu Aug 19 09:04:27 2010
@@ -147,8 +147,6 @@
     class abort(error): pass        # Service errors - close and retry
     class readonly(abort): pass     # Mailbox status changed to READ-ONLY
 
-    mustquote = re.compile(br"[^\w!#$%&'*+,.:;<=>?^`|~-]", re.ASCII)
-
     def __init__(self, host = '', port = IMAP4_PORT):
         self.debug = Debug
         self.state = 'LOGOUT'
@@ -846,7 +844,6 @@
             if arg is None: continue
             if isinstance(arg, str):
                 arg = bytes(arg, "ASCII")
-            #data = data + b' ' + self._checkquote(arg)
             data = data + b' ' + arg
 
         literal = self.literal
@@ -1055,18 +1052,6 @@
         return tag
 
 
-    def _checkquote(self, arg):
-
-        # Must quote command args if non-alphanumeric chars present,
-        # and not already quoted.
-
-        if len(arg) >= 2 and (arg[0],arg[-1]) in (('(',')'),('"','"')):
-            return arg
-        if arg and self.mustquote.search(arg) is None:
-            return arg
-        return self._quote(arg)
-
-
     def _quote(self, arg):
 
         arg = arg.replace(b'\\', b'\\\\')