You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/02/10 22:44:50 UTC

[allura] 19/41: [#8349] python-modernize -n -w --no-diffs -f basestring .

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8349
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 0d44182eda590fa82c6db99be9565dfe35658755
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Feb 10 14:35:59 2020 -0500

    [#8349] python-modernize -n -w --no-diffs -f basestring .
---
 Allura/allura/app.py                                     | 4 ++--
 Allura/allura/ext/admin/admin_main.py                    | 4 ++--
 Allura/allura/lib/app_globals.py                         | 2 +-
 Allura/allura/lib/helpers.py                             | 4 ++--
 Allura/allura/lib/mail_util.py                           | 4 ++--
 Allura/allura/lib/plugin.py                              | 2 +-
 Allura/allura/lib/utils.py                               | 2 +-
 Allura/allura/lib/validators.py                          | 2 +-
 Allura/allura/lib/widgets/form_fields.py                 | 2 +-
 Allura/allura/model/repository.py                        | 2 +-
 Allura/allura/tasks/mail_tasks.py                        | 8 ++++----
 AlluraTest/alluratest/validation.py                      | 4 ++--
 ForgeDiscussion/forgediscussion/widgets/forum_widgets.py | 3 ++-
 ForgeSVN/forgesvn/tests/model/test_repository.py         | 2 +-
 ForgeTracker/forgetracker/widgets/ticket_form.py         | 3 ++-
 scripts/project-import.py                                | 2 +-
 scripts/teamforge-import.py                              | 2 +-
 scripts/trac_import.py                                   | 2 +-
 18 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 99ddc4f..0d2d2a2 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -993,9 +993,9 @@ class DefaultAdminController(BaseController, AdminControllerMixin):
             new_group_ids = args.get('new', [])
             del_group_ids = []
             group_ids = args.get('value', [])
-            if isinstance(new_group_ids, basestring):
+            if isinstance(new_group_ids, six.string_types):
                 new_group_ids = [new_group_ids]
-            if isinstance(group_ids, basestring):
+            if isinstance(group_ids, six.string_types):
                 group_ids = [group_ids]
 
             for acl in old_acl:
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index cd14c06..bda9878 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -985,9 +985,9 @@ class PermissionsController(BaseController):
             perm = args['id']
             new_group_ids = args.get('new', [])
             group_ids = args.get('value', [])
-            if isinstance(new_group_ids, basestring):
+            if isinstance(new_group_ids, six.string_types):
                 new_group_ids = [new_group_ids]
-            if isinstance(group_ids, basestring):
+            if isinstance(group_ids, six.string_types):
                 group_ids = [group_ids]
             # make sure the admin group has the admin permission
             if perm == 'admin':
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 577c261..3809ad8 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -572,7 +572,7 @@ class Globals(object):
         'h.set_context() is preferred over this method'
         if isinstance(pid_or_project, M.Project):
             c.project = pid_or_project
-        elif isinstance(pid_or_project, basestring):
+        elif isinstance(pid_or_project, six.string_types):
             raise TypeError('need a Project instance, got %r' % pid_or_project)
         elif pid_or_project is None:
             c.project = None
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 3f0b950..bfa5038 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -348,7 +348,7 @@ def set_context(project_shortname_or_id, mount_point=None, app_config_id=None, n
     if app_config_id is None:
         c.app = p.app_instance(mount_point)
     else:
-        if isinstance(app_config_id, basestring):
+        if isinstance(app_config_id, six.string_types):
             app_config_id = ObjectId(app_config_id)
         app_config = model.AppConfig.query.get(_id=app_config_id)
         c.app = p.app_instance(app_config)
@@ -413,7 +413,7 @@ def convert_bools(conf, prefix=''):
     :return: dict
     '''
     def convert_value(val):
-        if isinstance(val, basestring):
+        if isinstance(val, six.string_types):
             if val.strip().lower() == 'true':
                 return True
             elif val.strip().lower() == 'false':
diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py
index e686502..7a425c5 100644
--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -70,7 +70,7 @@ def AddrHeader(fromaddr):
         foo@bar.com
         "Foo Bar" <fo...@bar.com>
     '''
-    if isinstance(fromaddr, basestring) and ' <' in fromaddr:
+    if isinstance(fromaddr, six.string_types) and ' <' in fromaddr:
         name, addr = fromaddr.rsplit(' <', 1)
         addr = '<' + addr  # restore the char we just split off
         addrheader = Header(name, addr)
@@ -274,7 +274,7 @@ class SMTPClient(object):
             message['CC'] = AddrHeader(cc)
             addrs.append(cc)
         if in_reply_to:
-            if not isinstance(in_reply_to, basestring):
+            if not isinstance(in_reply_to, six.string_types):
                 raise TypeError('Only strings are supported now, not lists')
             message['In-Reply-To'] = Header('<%s>' % in_reply_to)
             if not references:
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index e090e71..6e0d9d6 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1064,7 +1064,7 @@ class ProjectRegistrationProvider(object):
                 tool_config = project_template['tools'][tool]
                 tool_options = tool_config.get('options', {})
                 for k, v in six.iteritems(tool_options):
-                    if isinstance(v, basestring):
+                    if isinstance(v, six.string_types):
                         tool_options[k] = \
                             string.Template(v).safe_substitute(
                                 p.__dict__.get('root_project', {}))
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 02b8bd0..336383a 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -789,7 +789,7 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
     """
     if strings_only and isinstance(s, (types.NoneType, int)):
         return s
-    elif not isinstance(s, basestring):
+    elif not isinstance(s, six.string_types):
         try:
             return str(s)
         except UnicodeEncodeError:
diff --git a/Allura/allura/lib/validators.py b/Allura/allura/lib/validators.py
index 9c8367b..cd29024 100644
--- a/Allura/allura/lib/validators.py
+++ b/Allura/allura/lib/validators.py
@@ -301,7 +301,7 @@ class UserMapJsonFile(JsonFile):
         value = super(self.__class__, self)._to_python(value, state)
         try:
             for k, v in six.iteritems(value):
-                if not(isinstance(k, basestring) and isinstance(v, basestring)):
+                if not(isinstance(k, six.string_types) and isinstance(v, six.string_types)):
                     raise
             return json.dumps(value) if self.as_string else value
         except:
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index 52c678a..64beee5 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -64,7 +64,7 @@ class LabelEdit(ew.InputField):
         placeholder=None)
 
     def from_python(self, value, state=None):
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             return value
         elif value is None:
             return ''
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 2460919..7d34967 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -197,7 +197,7 @@ class RepositoryImplementation(object):
 
     def url_for_commit(self, commit, url_type='ci'):
         'return an URL, given either a commit or object id'
-        if isinstance(commit, basestring):
+        if isinstance(commit, six.string_types):
             object_id = commit
         else:
             object_id = commit._id
diff --git a/Allura/allura/tasks/mail_tasks.py b/Allura/allura/tasks/mail_tasks.py
index 66a870d..c2774af 100644
--- a/Allura/allura/tasks/mail_tasks.py
+++ b/Allura/allura/tasks/mail_tasks.py
@@ -155,7 +155,7 @@ def sendmail(fromaddr, destinations, text, reply_to, subject,
     addrs_multi = []
     if fromaddr is None:
         fromaddr = g.noreply
-    elif not isinstance(fromaddr, basestring) or '@' not in fromaddr:
+    elif not isinstance(fromaddr, six.string_types) or '@' not in fromaddr:
         log.warning('Looking up user with fromaddr: %s', fromaddr)
         user = M.User.query.get(_id=ObjectId(fromaddr), disabled=False, pending=False)
         if not user:
@@ -224,7 +224,7 @@ def sendsimplemail(
     from allura import model as M
     if fromaddr is None:
         fromaddr = g.noreply
-    elif not isinstance(fromaddr, basestring) or '@' not in fromaddr:
+    elif not isinstance(fromaddr, six.string_types) or '@' not in fromaddr:
         log.warning('Looking up user with fromaddr: %s', fromaddr)
         user = M.User.query.get(_id=ObjectId(fromaddr), disabled=False, pending=False)
         if not user:
@@ -233,7 +233,7 @@ def sendsimplemail(
         else:
             fromaddr = user.email_address_header()
 
-    if not isinstance(toaddr, basestring) or '@' not in toaddr:
+    if not isinstance(toaddr, six.string_types) or '@' not in toaddr:
         log.warning('Looking up user with toaddr: %s', toaddr)
         user = M.User.query.get(_id=ObjectId(toaddr), disabled=False, pending=False)
         if not user:
@@ -257,7 +257,7 @@ def send_system_mail_to_user(user_or_emailaddr, subject, text):
     :param subject: subject of the email
     :param text: text of the email (markdown)
     '''
-    if isinstance(user_or_emailaddr, basestring):
+    if isinstance(user_or_emailaddr, six.string_types):
         toaddr = user_or_emailaddr
     else:
         toaddr = user_or_emailaddr._id
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index df2f246..99065c0 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -260,7 +260,7 @@ class PostParamCheckingTestApp(AntiSpamTestApp):
         if hasattr(params, 'items'):
             params = list(params.items())
         for k, v in params:
-            if not isinstance(k, basestring):
+            if not isinstance(k, six.string_types):
                 raise TypeError('%s key %s is %s, not str' %
                                 (method, k, type(k)))
             self._validate_val(k, v, method)
@@ -269,7 +269,7 @@ class PostParamCheckingTestApp(AntiSpamTestApp):
         if isinstance(v, (list, tuple)):
             for vv in v:
                 self._validate_val(k, vv, method)
-        elif not isinstance(v, (basestring, webtest.forms.File, webtest.forms.Upload)):
+        elif not isinstance(v, (six.string_types, webtest.forms.File, webtest.forms.Upload)):
             raise TypeError(
                 '%s key %s has value %s of type %s, not str. ' %
                 (method, k, v, type(v)))
diff --git a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
index 9355fe6..97ffe9d 100644
--- a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
+++ b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
@@ -30,6 +30,7 @@ from allura.lib.widgets.forms import CsrfForm
 from allura.lib.widgets.subscriptions import SubscribeForm
 
 from forgediscussion import model as M
+import six
 
 
 class _ThreadsTable(DW._ThreadsTable):
@@ -88,7 +89,7 @@ class _ForumSelector(ew.SingleSelectField):
         return result
 
     def from_python(self, value, state):
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             return value
         else:
             return value.shortname
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 76e97ec..046c17a 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -655,7 +655,7 @@ class _Test(unittest.TestCase):
         repo = getattr(self, 'repo', None)
         t.repo = repo
         for k, v in six.iteritems(kwargs):
-            if isinstance(v, basestring):
+            if isinstance(v, six.string_types):
                 obj = M.repository.Blob(
                     t, k, next(self.idgen))
                 t.blob_ids.append(Object(
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index b7674ec..4778a36 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -28,6 +28,7 @@ from allura import model as M
 from allura.lib.widgets import form_fields as ffw
 from allura.lib import helpers as h
 from allura.lib import validators as v
+import six
 
 
 class TicketCustomFields(ew.CompoundField):
@@ -90,7 +91,7 @@ class GenericTicketForm(ew.SimpleForm):
         since normally `ProjectUserCombo` shows without any options, and loads
         them asynchronously (via ajax).
         """
-        if isinstance(user, basestring):
+        if isinstance(user, six.string_types):
             user = M.User.by_username(user)
         if user and user != M.User.anonymous():
             field.options = [
diff --git a/scripts/project-import.py b/scripts/project-import.py
index 06df746..584a02f 100644
--- a/scripts/project-import.py
+++ b/scripts/project-import.py
@@ -250,7 +250,7 @@ def create_project(p, nbhd, options):
                 continue
             tool_options = tool_config.get('options', {})
             for k, v in six.iteritems(tool_options):
-                if isinstance(v, basestring):
+                if isinstance(v, six.string_types):
                     tool_options[k] = string.Template(v).safe_substitute(
                         project.root_project.__dict__.get('root_project', {}))
             project.install_app(tool,
diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py
index 6c3cad1..0aca4a5 100644
--- a/scripts/teamforge-import.py
+++ b/scripts/teamforge-import.py
@@ -183,7 +183,7 @@ def load_users():
 
 
 def save_user(usernames):
-    if isinstance(usernames, basestring):
+    if isinstance(usernames, six.string_types):
         usernames = [usernames]
 
     load_users()
diff --git a/scripts/trac_import.py b/scripts/trac_import.py
index ef4806d..e9eed3c 100644
--- a/scripts/trac_import.py
+++ b/scripts/trac_import.py
@@ -46,7 +46,7 @@ def main():
                 raise ValueError
             for k, v in six.iteritems(user_map):
                 print(k, v)
-                if not isinstance(k, basestring) or not isinstance(v, basestring):
+                if not isinstance(k, six.string_types) or not isinstance(v, six.string_types):
                     raise ValueError
         except ValueError:
             optparser.error(