Python 3 preparation: replace raw_input uses.

The existing my_input in roundup/admin.py is moved to a new
roundup/anypy/my_input.py, which is then used in more places.  Manual
patch.

Author: jsm28

roundup/admin.py

@@ -31,12 +31,7 @@
 from roundup.configuration import CoreConfig, NoConfigError
 from roundup.i18n import _
 from roundup.exceptions import UsageError
-
-# Polyglot code
-try:
-    my_input = raw_input
-except NameError:
-    my_input = input
+from roundup.anypy.my_input import my_input
 
 class CommandDict(UserDict.UserDict):
     """Simple dictionary that lets us do lookups using partial keys.

roundup/anypy/my_input.py

@@ -0,0 +1,6 @@
+try:
+    # Python 2.
+    my_input = raw_input
+except NameError:
+    # Python 3+.
+    my_input = input

roundup/mailgw.py

@@ -101,6 +101,7 @@ class node. Any parts of other types are each stored in separate files
 import email.utils
 
 from .anypy.email_ import decode_header
+from roundup.anypy.my_input import my_input
 
 from roundup import configuration, hyperdb, date, password, exceptions
 from roundup.mailer import Mailer, MessageSendError
@@ -1372,7 +1373,7 @@ def do_imap(self, server, user='', password='', mailbox='', ssl=0,
         import getpass, imaplib, socket
         try:
             if not user:
-                user = raw_input('User: ')
+                user = my_input('User: ')
             if not password:
                 password = getpass.getpass()
         except (KeyboardInterrupt, EOFError):
@@ -1461,7 +1462,7 @@ def _do_pop(self, server, user, password, apop, ssl):
             poplib._MAXLINE = 100*1024
         try:
             if not user:
-                user = raw_input('User: ')
+                user = my_input('User: ')
             if not password:
                 password = getpass.getpass()
         except (KeyboardInterrupt, EOFError):

roundup/scripts/roundup_demo.py

@@ -24,6 +24,7 @@
 
 from roundup import admin, configuration, demo, instance
 from roundup.i18n import _
+from roundup.anypy.my_input import my_input
 
 def run():
     home = DEFAULT_HOME
@@ -43,12 +44,12 @@ def run():
         # FIXME: i'd like to have an option to abort the tracker creation
         #   say, by entering a single dot.  but i cannot think of
         #   appropriate prompt for that.
-        home = raw_input(
+        home = my_input(
             _('Enter directory path to create demo tracker [%s]: ') % home)
         if not home:
             home = DEFAULT_HOME
         templates = admin.AdminTool().listTemplates().keys()
-        template = raw_input(
+        template = my_input(
             _('Enter tracker template to use (one of (%s)) [%s]: ') %
             (','.join(templates),template))
         if not template:

scripts/imapServer.py

@@ -39,6 +39,8 @@
 import re
 import time
 
+from roundup.anypy.my_input import my_input
+
 logging.basicConfig()
 log = logging.getLogger('roundup.IMAPServer')
 
@@ -59,20 +61,20 @@ def __init__(self, dbhome='', username=None, password=None, mailbox=None
 
         try:
             if not self.dbhome:
-                self.dbhome = raw_input('Tracker home: ')
+                self.dbhome = my_input('Tracker home: ')
                 if not os.path.exists(self.dbhome):
                     raise ValueError('Invalid home address: ' \
                         'directory "%s" does not exist.' % self.dbhome)
 
             if not self.server:
-                self.server = raw_input('Server: ')
+                self.server = my_input('Server: ')
                 if not self.server:
                     raise ValueError('No Servername supplied')
-                protocol = raw_input('protocol [imaps]? ')
+                protocol = my_input('protocol [imaps]? ')
                 self.protocol = protocol
 
             if not self.username:
-                self.username = raw_input('Username: ')
+                self.username = my_input('Username: ')
                 if not self.username:
                     raise ValueError('Invalid Username')
 
@@ -83,7 +85,7 @@ def __init__(self, dbhome='', username=None, password=None, mailbox=None
                 # by a later entry
 
             #if self.mailbox is None:
-            #   self.mailbox = raw_input('Mailbox [INBOX]: ')
+            #   self.mailbox = my_input('Mailbox [INBOX]: ')
             #   # We allow an empty mailbox because that will
             #   # select the INBOX, whatever it is called