kallithea Changeset - aa093e05a1c6

Changeset - aa093e05a1c6

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2020-02-05 23:03:39
mads@kiilerich.com

py3: automatic migration with 2to3 -f raw_input

2 files changed with 4 insertions and 4 deletions:

kallithea/lib/db_manage.py

kallithea/lib/utils2.py

0 comments (0 inline, 0 general)

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -186,22 +186,22 @@ class DbManage(object): @@
                 if len(password) < 6:
                     log.error('password is to short use at least 6 characters')
                     return False
                 return password
             if username is None:
-                username = raw_input('Specify admin username:')
+                username = input('Specify admin username:')
             if password is None:
                 password = get_password()
                 if not password:
                     # second try
                     password = get_password()
                     if not password:
                         sys.exit()
             if email is None:
-                email = raw_input('Specify admin email:')
+                email = input('Specify admin email:')
             self.create_user(username, password, email, True)
         else:
             log.info('creating admin and regular test users')
             from kallithea.tests.base import TEST_USER_ADMIN_LOGIN, \
                 TEST_USER_ADMIN_PASS, TEST_USER_ADMIN_EMAIL, \
                 TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS, \
@@ @@ -291,13 +291,13 @@ class DbManage(object): @@
         if retries == 3:
             log.info('Setting up repositories config')
         if _path is not None:
             path = _path
         elif not self.tests and not test_repo_path:
-            path = raw_input(
+            path = input(
                  'Enter a valid absolute path to store repositories. '
                  'All repositories in that path will be added automatically:'
+            )
         else:
             path = test_repo_path
         path_ok = True

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -599,13 +599,13 @@ def repo_name_slug(value): @@
     slug = collapse(slug, '-')
     return slug
 def ask_ok(prompt, retries=4, complaint='Yes or no please!'):
     while True:
-        ok = raw_input(prompt)
+        ok = input(prompt)
         if ok in ('y', 'ye', 'yes'):
             return True
         if ok in ('n', 'no', 'nop', 'nope'):
             return False
         retries = retries - 1
         if retries < 0:

0 comments (0 inline, 0 general)