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/05/12 16:24:13 UTC

[allura] branch db/8361 created (now abd7d55)

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

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


      at abd7d55  [#8361] e.message doesn't exist in py3

This branch includes the following new commits:

     new 95fc826  [#8361] templates tests pass
     new 7a91052  [#8361] only strings for dispatch paths
     new 4b3f53b  [#8361] test_admin fixes; MaxBytesValidator should not convert
     new 9b6270f  [#8361] use our own UnicodeString validator to work around problem, make sure everywhere uses it
     new e65b783  [#8361] work around formencode problems with Files/bytes
     new abd7d55  [#8361] e.message doesn't exist in py3

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[allura] 04/06: [#8361] use our own UnicodeString validator to work around problem, make sure everywhere uses it

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9b6270fd9e9d9da76ba2e85b6ad5fb179b5f0fa3
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon May 11 18:11:59 2020 -0400

    [#8361] use our own UnicodeString validator to work around problem, make sure everywhere uses it
---
 Allura/allura/controllers/site_admin.py            |  8 ++--
 Allura/allura/ext/admin/widgets.py                 | 13 +++---
 Allura/allura/lib/validators.py                    | 22 +++++++--
 Allura/allura/lib/widgets/discuss.py               |  9 ++--
 Allura/allura/lib/widgets/form_fields.py           | 15 +++---
 Allura/allura/lib/widgets/forms.py                 | 54 +++++++++++-----------
 Allura/allura/lib/widgets/user_profile.py          |  7 +--
 Allura/allura/webhooks.py                          |  7 +--
 ForgeBlog/forgeblog/main.py                        |  7 +--
 ForgeBlog/forgeblog/widgets.py                     |  3 +-
 ForgeChat/forgechat/main.py                        |  3 +-
 .../forgediscussion/controllers/root.py            |  3 +-
 ForgeDiscussion/forgediscussion/widgets/admin.py   |  6 +--
 ForgeImporters/forgeimporters/base.py              |  4 +-
 ForgeImporters/forgeimporters/github/code.py       |  4 +-
 ForgeImporters/forgeimporters/github/tracker.py    |  4 +-
 ForgeImporters/forgeimporters/github/wiki.py       |  7 ++-
 ForgeShortUrl/forgeshorturl/main.py                |  3 +-
 ForgeTracker/forgetracker/tracker_main.py          | 19 ++++----
 ForgeTracker/forgetracker/widgets/admin.py         |  5 +-
 ForgeTracker/forgetracker/widgets/bin_form.py      |  9 ++--
 ForgeTracker/forgetracker/widgets/ticket_form.py   |  2 +-
 ForgeWiki/forgewiki/wiki_main.py                   |  7 +--
 requirements.in                                    |  2 +-
 24 files changed, 124 insertions(+), 99 deletions(-)

diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index 644c9c9..4fa7ffc 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -312,7 +312,7 @@ class SiteAdminController(object):
 
     @without_trailing_slash
     @expose('jinja:allura:templates/site_admin_search.html')
-    @validate(validators=dict(q=validators.UnicodeString(if_empty=None),
+    @validate(validators=dict(q=v.UnicodeString(if_empty=None),
                               limit=validators.Int(if_invalid=None),
                               page=validators.Int(if_empty=0, if_invalid=0)))
     def search_projects(self, q=None, f=None, page=0, limit=None, **kw):
@@ -327,7 +327,7 @@ class SiteAdminController(object):
 
     @without_trailing_slash
     @expose('jinja:allura:templates/site_admin_search.html')
-    @validate(validators=dict(q=validators.UnicodeString(if_empty=None),
+    @validate(validators=dict(q=v.UnicodeString(if_empty=None),
                               limit=validators.Int(if_invalid=None),
                               page=validators.Int(if_empty=0, if_invalid=0)))
     def search_users(self, q=None, f=None, page=0, limit=None, **kw):
@@ -344,8 +344,8 @@ class SiteAdminController(object):
 
 class DeleteProjectsController(object):
     delete_form_validators = dict(
-        projects=validators.UnicodeString(if_empty=None),
-        reason=validators.UnicodeString(if_empty=None),
+        projects=v.UnicodeString(if_empty=None),
+        reason=v.UnicodeString(if_empty=None),
         disable_users=validators.StringBool(if_empty=False))
 
     def remove_comments(self, lines):
diff --git a/Allura/allura/ext/admin/widgets.py b/Allura/allura/ext/admin/widgets.py
index 82b3962..0eedae6 100644
--- a/Allura/allura/ext/admin/widgets.py
+++ b/Allura/allura/ext/admin/widgets.py
@@ -159,7 +159,6 @@ class FeaturesField(ew.CompoundField):
         yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
         yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css', compress=False)  # compress will also serve from a different location, breaking image refs
 
-
 class MetadataAdmin(ff.AdminForm):
     template = 'jinja:allura.ext.admin:templates/admin_widgets/metadata_admin.html'
     defaults = dict(
@@ -170,15 +169,16 @@ class MetadataAdmin(ff.AdminForm):
         name = ew.InputField(field_type='text',
                              label='Name',
                              validator=formencode.All(
-                                 fev.UnicodeString(not_empty=True, max=40),
-                                 V.MaxBytesValidator(max=40)),
+                                 V.UnicodeString(not_empty=True, max=40),
+                                 V.MaxBytesValidator(max=40),
+                             ),
                              attrs={'maxlength': 40,
                                     'title': "This is the publicly viewable name of the project, and will appear on project listings. It should be what you want to see as the project title in search listing.",
                                     'class': 'tooltip',
                                     })
         summary = ew.InputField(field_type="text", label='Short Summary',
                                 validator=formencode.All(
-                                    fev.UnicodeString(max=70),
+                                    V.UnicodeString(max=70),
                                     V.MaxBytesValidator(max=70)),
                                 attrs={'maxlength': 70,
                                        'title': 'Briefly state what your project is and what it does without repeating the project name. This summary appears in Google search results beneath the project name.',
@@ -186,8 +186,9 @@ class MetadataAdmin(ff.AdminForm):
                                        })
         short_description = ew.TextArea(label='Full Description',
                                         validator=formencode.All(
-                                            fev.UnicodeString(max=1000),
-                                            V.MaxBytesValidator(max=1000)),
+                                            V.UnicodeString(max=1000),
+                                            V.MaxBytesValidator(max=1000),
+                                            ),
                                         attrs={
                                             'title': 'Describe the full functionality of your project using related keywords. The first sentence has the most impact on search. Provide unique content that calls out keywords and describes the merits of your project.',
                                             'class': 'tooltip'
diff --git a/Allura/allura/lib/validators.py b/Allura/allura/lib/validators.py
index f84ec5a..2dee7fc 100644
--- a/Allura/allura/lib/validators.py
+++ b/Allura/allura/lib/validators.py
@@ -68,6 +68,22 @@ class NonHttpUrl(URL):
     ''', re.I | re.VERBOSE)
 
 
+class UnicodeString(fev.UnicodeString):
+    """
+    Override UnicodeString to fix bytes handling.
+    Specifically ran into problems with its 'tooLong' check is running on bytes incorrectly and getting wrong length
+
+    Fixed elsewhere like this too:
+        https://github.com/formencode/formencode/issues/2#issuecomment-378410047
+        https://github.com/sightmachine/formencode/commit/665c9d0141dacb2dc84fb7d20ad3f8c0a5fe5e2d
+    """
+    encoding = None
+
+
+# make UnicodeString fix above work through this String alias, just like formencode aliases String
+String = UnicodeString if str is str else fev.ByteString
+
+
 class Ming(fev.FancyValidator):
 
     def __init__(self, cls, **kw):
@@ -90,7 +106,7 @@ class Ming(fev.FancyValidator):
             return value._id
 
 
-class UniqueOAuthApplicationName(fev.UnicodeString):
+class UniqueOAuthApplicationName(UnicodeString):
 
     def _to_python(self, value, state):
         from allura import model as M
@@ -127,7 +143,7 @@ class MaxBytesValidator(fev.FancyValidator):
         return h.really_unicode(value or '')
 
 
-class MountPointValidator(fev.UnicodeString):
+class MountPointValidator(UnicodeString):
 
     def __init__(self, app_class,
                  reserved_mount_points=('feed', 'index', 'icon', '_nav.json'), **kw):
@@ -320,7 +336,7 @@ class CreateTaskSchema(fe.Schema):
 class CreateSiteNotificationSchema(fe.Schema):
     active = fev.StringBool(if_missing=False)
     impressions = fev.Int(not_empty=True)
-    content = fev.UnicodeString(not_empty=True)
+    content = UnicodeString(not_empty=True)
     user_role = fev.FancyValidator(not_empty=False, if_empty=None)
     page_regex = fev.FancyValidator(not_empty=False, if_empty=None)
     page_tool_type = fev.FancyValidator(not_empty=False, if_empty=None)
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 25919cd..9338fbb 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -19,14 +19,11 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 from formencode import validators as fev
 
-import json
 import ew as ew_core
 import ew.jinja2_ew as ew
-from tg import app_globals as g
-from  tg import config
 
 from allura.lib import utils
-from allura.lib import validators as V
+from allura.lib import validators as v
 from allura.lib.widgets import form_fields as ffw
 from allura.lib.widgets import forms as ff
 from allura import model as M
@@ -169,7 +166,7 @@ class EditPost(ff.ForgeForm):
                     ew.TextField(name='subject', attrs=dict(style="width:97%")))
         else:
             # We are being validated
-            validator = fev.UnicodeString(not_empty=True, if_missing='')
+            validator = v.UnicodeString(not_empty=True, if_missing='')
             fields.append(ew.TextField(name='subject', validator=validator))
             fields.append(NullValidator(name=self.att_name))
         return fields
@@ -217,7 +214,7 @@ class _ThreadsTable(ew.TableField):
     template = 'jinja:allura:templates/widgets/threads_table.html'
 
     class fields(ew_core.NameList):
-        _id = ew.HiddenField(validator=V.Ming(M.Thread))
+        _id = ew.HiddenField(validator=v.Ming(M.Thread))
         subscription = ew.Checkbox(suppress_label=True)
         subject = ffw.DisplayOnlyField(label='Topic')
         url = ffw.DisplayOnlyField()
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index e02d6b8..5ef2ed0 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -30,6 +30,9 @@ import ew.jinja2_ew as ew
 import six
 from six.moves import range
 
+from allura.lib import validators as v
+
+
 log = logging.getLogger(__name__)
 
 
@@ -37,7 +40,7 @@ def onready(text):
     return ew.JSScript('$(function () {%s});' % text)
 
 
-class LabelList(fev.UnicodeString):
+class LabelList(v.UnicodeString):
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('if_empty', [])
@@ -268,7 +271,7 @@ class AutoResizeTextarea(ew.TextArea):
 
 class MarkdownEdit(ew.TextArea):
     template = 'jinja:allura:templates/widgets/markdown_edit.html'
-    validator = fev.UnicodeString()
+    validator = v.UnicodeString()
     defaults = dict(
         ew.TextArea.defaults,
         name=None,
@@ -332,9 +335,9 @@ class PageList(ew_core.Widget):
     @property
     def url_params(self, **kw):
         url_params = dict()
-        for k, v in six.iteritems(request.params):
+        for k, val in six.iteritems(request.params):
             if k not in ['limit', 'count', 'page']:
-                url_params[k] = v
+                url_params[k] = val
         return url_params
 
 
@@ -350,9 +353,9 @@ class PageSize(ew_core.Widget):
     @property
     def url_params(self, **kw):
         url_params = dict()
-        for k, v in six.iteritems(request.params):
+        for k, val in six.iteritems(request.params):
             if k not in ['limit', 'count', 'page']:
-                url_params[k] = v
+                url_params[k] = val
         return url_params
 
     def resources(self):
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index ab0ef32..54082ce 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -151,14 +151,14 @@ class PasswordChangeBase(ForgeForm):
                     required=True,
                     autocomplete='new-password',
                 ),
-                validator=fev.UnicodeString(
+                validator=V.UnicodeString(
                     not_empty=True,
                     min=asint(tg.config.get('auth.min_password_len', 6)),
                     max=asint(tg.config.get('auth.max_password_len', 30)))),
             ew.PasswordField(
                 name='pw2',
                 label='New Password (again)',
-                validator=fev.UnicodeString(not_empty=True),
+                validator=V.UnicodeString(not_empty=True),
                 attrs=dict(
                     required=True,
                     autocomplete='new-password',
@@ -185,7 +185,7 @@ class PasswordChangeForm(PasswordChangeBase):
             ew.PasswordField(
                 name='oldpw',
                 label='Old Password',
-                validator=fev.UnicodeString(not_empty=True),
+                validator=V.UnicodeString(not_empty=True),
                 attrs=dict(
                     required=True,
                     autocomplete='current-password',
@@ -200,14 +200,14 @@ class PasswordChangeForm(PasswordChangeBase):
                     required=True,
                     autocomplete='new-password',
                 ),
-                validator=fev.UnicodeString(
+                validator=V.UnicodeString(
                     not_empty=True,
                     min=asint(tg.config.get('auth.min_password_len', 6)),
                     max=asint(tg.config.get('auth.max_password_len', 30)))),
             ew.PasswordField(
                 name='pw2',
                 label='New Password (again)',
-                validator=fev.UnicodeString(not_empty=True),
+                validator=V.UnicodeString(not_empty=True),
                 attrs=dict(
                     required=True,
                     autocomplete='new-password',
@@ -257,7 +257,7 @@ class PersonalDataForm(ForgeForm):
                          for v in ['Male', 'Female', 'Unknown', 'Other']],
                 validator=formencode.All(
                     V.OneOfValidator(['Male', 'Female', 'Unknown', 'Other']),
-                    fev.UnicodeString(not_empty=True))),
+                    V.UnicodeString(not_empty=True))),
             ew.SingleSelectField(
                 name='country',
                 label='Country of residence',
@@ -271,7 +271,7 @@ class PersonalDataForm(ForgeForm):
                 name='city',
                 label='City of residence',
                 attrs=dict(value=None),
-                validator=fev.UnicodeString(not_empty=False)),
+                validator=V.UnicodeString(not_empty=False)),
             ew.SingleSelectField(
                 name='timezone',
                 label='Timezone',
@@ -364,7 +364,7 @@ class AddTelNumberForm(ForgeForm):
         newnumber = ew.TextField(
             label='New telephone number',
             attrs={'value': ''},
-            validator=fev.UnicodeString(not_empty=True))
+            validator=V.UnicodeString(not_empty=True))
 
     def display(self, **kw):
         initial_value = kw.get('initial_value', '')
@@ -394,7 +394,7 @@ class SkypeAccountForm(ForgeForm):
         skypeaccount = ew.TextField(
             label='Skype account',
             attrs={'value': ''},
-            validator=fev.UnicodeString(not_empty=False))
+            validator=V.UnicodeString(not_empty=False))
 
     def display(self, **kw):
         initial_value = kw.get('initial_value', '')
@@ -450,13 +450,13 @@ class AddSocialNetworkForm(ForgeForm):
             ew.SingleSelectField(
                 name='socialnetwork',
                 label='Social network',
-                validator=fev.UnicodeString(not_empty=True),
+                validator=V.UnicodeString(not_empty=True),
                 options=[ew.Option(py_value=name, label=name)
                          for name in socialnetworks]),
             ew.TextField(
                 name='accounturl',
                 label='Account url',
-                validator=fev.UnicodeString(not_empty=True))
+                validator=V.UnicodeString(not_empty=True))
         ]
 
 
@@ -501,12 +501,12 @@ class AddInactivePeriodForm(ForgeForm):
             label='Start date',
             validator=formencode.All(
                 V.DateValidator(),
-                fev.UnicodeString(not_empty=True)))
+                V.UnicodeString(not_empty=True)))
         enddate = ew.TextField(
             label='End date',
             validator=formencode.All(
                 V.DateValidator(),
-                fev.UnicodeString(not_empty=True)))
+                V.UnicodeString(not_empty=True)))
 
     @ew_core.core.validator
     def to_python(self, kw, state):
@@ -560,17 +560,17 @@ class AddTimeSlotForm(ForgeForm):
                      for wd in weekdays],
             validator=formencode.All(
                 V.OneOfValidator(weekdays),
-                fev.UnicodeString(not_empty=True)))
+                V.UnicodeString(not_empty=True)))
         starttime = ew.TextField(
             label='Start time',
             validator=formencode.All(
                 V.TimeValidator(),
-                fev.UnicodeString(not_empty=True)))
+                V.UnicodeString(not_empty=True)))
         endtime = ew.TextField(
             label='End time',
             validator=formencode.All(
                 V.TimeValidator(),
-                fev.UnicodeString(not_empty=True)))
+                V.UnicodeString(not_empty=True)))
 
     @ew_core.core.validator
     def to_python(self, kw, state):
@@ -667,10 +667,10 @@ class AddTroveCategoryForm(ForgeForm):
         categoryname = ew.TextField(
             label="Category name",
             attrs={},
-            validator=fev.UnicodeString(not_empty=True))
+            validator=V.UnicodeString(not_empty=True))
         shortname = ew.TextField(
             label="Short name",
-            validator=fev.UnicodeString(),
+            validator=V.UnicodeString(),
             attrs={'placeholder': 'optional; unique identifier'})
 
     def display(self, **kw):
@@ -693,7 +693,7 @@ class AddUserSkillForm(ForgeForm):
         selected_skill = ew.HiddenField(
             attrs={'value': ''},
             show_errors=False,
-            validator=fev.UnicodeString(not_empty=True))
+            validator=V.UnicodeString(not_empty=True))
         level = ew.SingleSelectField(
             label="Level of knowledge",
             options=[
@@ -702,10 +702,10 @@ class AddUserSkillForm(ForgeForm):
                 ew.Option(py_value="high", label="Advanced level")],
             validator=formencode.All(
                 V.OneOfValidator(['low', 'medium', 'high']),
-                fev.UnicodeString(not_empty=True)))
+                V.UnicodeString(not_empty=True)))
         comment = ew.TextArea(
             label="Additional comments",
-            validator=fev.UnicodeString(not_empty=False),
+            validator=V.UnicodeString(not_empty=False),
             attrs={'rows': 5, 'cols': 30})
 
     def display(self, **kw):
@@ -732,7 +732,7 @@ class SelectSubCategoryForm(ForgeForm):
         ]
         self.fields['selected_category'].validator = formencode.All(
             V.OneOfValidator(categories),
-            fev.UnicodeString(not_empty=True))
+            V.UnicodeString(not_empty=True))
         return super(ForgeForm, self).display(**kw)
 
 
@@ -790,7 +790,7 @@ class RegistrationForm(ForgeForm):
             ew.TextField(
                 name='display_name',
                 label='Displayed Name',
-                validator=fev.UnicodeString(not_empty=True)),
+                validator=V.UnicodeString(not_empty=True)),
             username,
         ]
         if asbool(config.get('auth.require_email_addr', False)):
@@ -803,14 +803,14 @@ class RegistrationForm(ForgeForm):
                 name='pw',
                 label='New Password',
                 attrs=dict(minlength=asint(tg.config.get('auth.min_password_len', 6)), maxlength=asint(tg.config.get('auth.max_password_len', 30))),
-                validator=fev.UnicodeString(
+                validator=V.UnicodeString(
                     not_empty=True,
                     min=asint(tg.config.get('auth.min_password_len', 6)),
                     max=asint(tg.config.get('auth.max_password_len', 30)))),
             ew.PasswordField(
                 name='pw2',
                 label='New Password (again)',
-                validator=fev.UnicodeString(not_empty=True)),
+                validator=V.UnicodeString(not_empty=True)),
         ]
         return fields
 
@@ -995,7 +995,7 @@ class NeighborhoodAddProjectForm(ForgeForm):
             ew.InputField(name='project_name', label='Project Name',
                           field_type='text',
                           validator=formencode.All(
-                              fev.UnicodeString(not_empty=True, max=40),
+                              V.UnicodeString(not_empty=True, max=40),
                               V.MaxBytesValidator(max=40)),
                           ),
             ew.InputField(name='project_unixname',
@@ -1175,7 +1175,7 @@ class AwardGrantForm(ForgeForm):
             ew.TextArea(
                 name='comment',
                 label='Comment',
-                validator=fev.UnicodeString(not_empty=False),
+                validator=V.UnicodeString(not_empty=False),
                 attrs={'rows': 5, 'cols': 30}),
         ]
 
diff --git a/Allura/allura/lib/widgets/user_profile.py b/Allura/allura/lib/widgets/user_profile.py
index fd2e17e..587bf45 100644
--- a/Allura/allura/lib/widgets/user_profile.py
+++ b/Allura/allura/lib/widgets/user_profile.py
@@ -25,11 +25,12 @@ import ew.jinja2_ew as ew
 from jinja2 import Markup
 from paste.deploy.converters import asbool
 import tg
-from formencode import validators as fev
 from tg import app_globals as g
 from tg import request
 from tg import tmpl_context as c
+
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.plugin import AuthenticationProvider
 from .forms import ForgeForm
 
@@ -42,7 +43,7 @@ class SendMessageForm(ForgeForm):
 
     class fields(ew_core.NameList):
         subject = ew.TextField(
-            validator=fev.UnicodeString(
+            validator=v.UnicodeString(
                 not_empty=True,
                 messages={'empty': "You must provide a Subject"}),
             attrs=dict(
@@ -52,7 +53,7 @@ class SendMessageForm(ForgeForm):
             label='Subject')
 
         message = ew.TextArea(
-            validator=fev.UnicodeString(
+            validator=v.UnicodeString(
                 not_empty=True,
                 messages={'empty': "You must provide a Message"}),
             attrs=dict(
diff --git a/Allura/allura/webhooks.py b/Allura/allura/webhooks.py
index a33a71b..c41d8c0 100644
--- a/Allura/allura/webhooks.py
+++ b/Allura/allura/webhooks.py
@@ -40,6 +40,7 @@ from paste.deploy.converters import asint, aslist
 from allura.app import AdminControllerMixin
 from allura.controllers import BaseController
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.decorators import require_post, task
 from allura.lib.utils import DateJSONEncoder
 from allura import model as M
@@ -74,7 +75,7 @@ class WebhookValidator(fev.FancyValidator):
 
 class WebhookCreateForm(schema.Schema):
     url = fev.URL(not_empty=True)
-    secret = fev.UnicodeString()
+    secret = v.UnicodeString()
 
 
 class WebhookEditForm(WebhookCreateForm):
@@ -221,8 +222,8 @@ class WebhookRestController(BaseController):
         error = getattr(e, 'error_dict', None)
         if error:
             _error = {}
-            for k, v in six.iteritems(error):
-                _error[k] = six.text_type(v)
+            for k, val in six.iteritems(error):
+                _error[k] = six.text_type(val)
             return _error
         error = getattr(e, 'msg', None)
         if not error:
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 04963f5..344a4b1 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -39,6 +39,7 @@ from ming.orm import session
 from allura.app import Application, SitemapEntry, ConfigOption
 from allura.app import DefaultAdminController
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.utils import JSONForExport
 from allura.tasks import notification_tasks
 from allura.lib.search import search_app
@@ -271,7 +272,7 @@ class RootController(BaseController, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgeblog:templates/blog/search.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    history=validators.StringBool(if_empty=False),
                    search_comments=validators.StringBool(if_empty=False),
                    project=validators.StringBool(if_empty=False)))
@@ -434,8 +435,8 @@ class PostController(BaseController, FeedController):
         old_text = self.post.text
         if attachment is not None:
             self.post.add_multiple_attachments(attachment)
-        for k, v in six.iteritems(kw):
-            setattr(self.post, k, v)
+        for k, val in six.iteritems(kw):
+            setattr(self.post, k, val)
         self.post.commit()
         notification_tasks.send_usermentions_notification.post(self.post.index_id(), kw['text'], old_text)
         redirect('.')
diff --git a/ForgeBlog/forgeblog/widgets.py b/ForgeBlog/forgeblog/widgets.py
index 3d52bc5..b08df34 100644
--- a/ForgeBlog/forgeblog/widgets.py
+++ b/ForgeBlog/forgeblog/widgets.py
@@ -25,6 +25,7 @@ from formencode import validators as fev
 from allura.lib.widgets import form_fields as ffw
 from allura.lib.widgets import forms
 from allura import model as M
+from allura.lib import validators as v
 
 
 class BlogPager(ffw.PageList):
@@ -39,7 +40,7 @@ class BlogPostForm(forms.ForgeForm):
     def fields(self):
         return ew_core.NameList([
             ew.TextField(name='title',
-                         validator=fev.UnicodeString(not_empty=True,
+                         validator=v.UnicodeString(not_empty=True,
                                                      messages={'empty': "You must provide a Title"}),
                          attrs=dict(placeholder='Enter your title here',
                                     title='Enter your title here',
diff --git a/ForgeChat/forgechat/main.py b/ForgeChat/forgechat/main.py
index 8742489..e3b4765 100644
--- a/ForgeChat/forgechat/main.py
+++ b/ForgeChat/forgechat/main.py
@@ -33,6 +33,7 @@ from ming.utils import LazyProperty
 # Pyforge-specific imports
 from allura.app import Application, ConfigOption, SitemapEntry, DefaultAdminController
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.search import search_app
 from allura.lib.decorators import require_post
 from allura.lib.security import require_access
@@ -150,7 +151,7 @@ class RootController(BaseController):
 
     @with_trailing_slash
     @expose('jinja:forgechat:templates/chat/search.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    project=validators.StringBool(if_empty=False)))
     def search(self, q=None, project=None, limit=None, page=0, **kw):
         c.search_results = SearchResults()
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index caa7ce7..0356f30 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -36,6 +36,7 @@ import pymongo
 from allura.lib.security import require_access, has_access, require_authenticated
 from allura.lib.search import search_app
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.utils import AntiSpam
 from allura.lib.decorators import require_post, memorable_forget
 from allura.controllers import BaseController, DispatchIndex
@@ -151,7 +152,7 @@ class RootController(BaseController, DispatchIndex, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgediscussion:templates/discussionforums/search.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    history=validators.StringBool(if_empty=False),
                    project=validators.StringBool(if_empty=False),
                    limit=validators.Int(if_empty=None, if_invalid=None),
diff --git a/ForgeDiscussion/forgediscussion/widgets/admin.py b/ForgeDiscussion/forgediscussion/widgets/admin.py
index cec8eda..6c650b4 100644
--- a/ForgeDiscussion/forgediscussion/widgets/admin.py
+++ b/ForgeDiscussion/forgediscussion/widgets/admin.py
@@ -25,7 +25,7 @@ from bson import ObjectId
 import ew.jinja2_ew as ew
 
 from allura.lib.widgets import forms as ff
-from allura.lib.widgets import form_fields as ffw
+from allura.lib import validators as v
 from allura.lib import helpers as h
 from forgediscussion import model as DM
 
@@ -66,7 +66,7 @@ class AddForum(ff.AdminForm):
         fields = [
             ew.HiddenField(name='app_id', label='App'),
             ew.TextField(name='name', label='Name',
-                         validator=fev.UnicodeString()),
+                         validator=v.UnicodeString()),
             ew.TextField(name='shortname', label='Short Name',
                          validator=All(
                              fev.Regex(r"^[^\s\/\.]*$", not_empty=True, messages={
@@ -75,7 +75,7 @@ class AddForum(ff.AdminForm):
                              UniqueForumShortnameValidator())),
             ew.TextField(name='parent', label='Parent Forum'),
             ew.TextField(name='description', label='Description',
-                         validator=fev.UnicodeString()),
+                         validator=v.UnicodeString()),
             ew.TextField(name='monitoring_email',
                          label='Monitoring Email', validator=fev.Email()),
             ew.Checkbox(name="members_only", label="Developer Only"),
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 13a7a7b..ea87738 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -71,7 +71,7 @@ class ProjectImportForm(schema.Schema):
         self.allow_extra_fields = True
 
     neighborhood = fev.NotEmpty()
-    project_name = fev.UnicodeString(not_empty=True, max=40)
+    project_name = v.UnicodeString(not_empty=True, max=40)
 
 
 class ToolImportForm(schema.Schema):
@@ -79,7 +79,7 @@ class ToolImportForm(schema.Schema):
     def __init__(self, tool_class):
         super(ToolImportForm, self).__init__()
         self.add_field('mount_point', v.MountPointValidator(tool_class))
-    mount_label = fev.UnicodeString()
+    mount_label = v.UnicodeString()
 
 
 class ImportErrorHandler(object):
diff --git a/ForgeImporters/forgeimporters/github/code.py b/ForgeImporters/forgeimporters/github/code.py
index 8a4449e..0fb06a4 100644
--- a/ForgeImporters/forgeimporters/github/code.py
+++ b/ForgeImporters/forgeimporters/github/code.py
@@ -19,7 +19,6 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 from tg import tmpl_context as c
 from tg import app_globals as g
-from formencode import validators as fev
 from tg import (
     expose,
     flash,
@@ -32,6 +31,7 @@ from tg.decorators import (
 
 from allura.lib.decorators import require_post
 from allura import model as M
+from allura.lib import validators as v
 
 from forgeimporters.base import (
     ToolImporter,
@@ -46,7 +46,7 @@ from forgeimporters.github import (
 
 
 class GitHubRepoImportForm(ToolImportForm):
-    gh_user_name = fev.UnicodeString(not_empty=True)
+    gh_user_name = v.UnicodeString(not_empty=True)
     gh_project_name = GitHubProjectNameValidator()
 
 
diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py
index b796d3c..7e55a01 100644
--- a/ForgeImporters/forgeimporters/github/tracker.py
+++ b/ForgeImporters/forgeimporters/github/tracker.py
@@ -24,7 +24,6 @@ from six.moves.urllib.error import HTTPError
 import six
 from io import BytesIO
 
-from formencode import validators as fev
 from tg import (
     expose,
     flash,
@@ -37,6 +36,7 @@ from tg.decorators import (
 
 from allura import model as M
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.plugin import ImportIdConverter
 from allura.lib.decorators import require_post
 from ming.orm import session, ThreadLocalORMSession
@@ -62,7 +62,7 @@ log = logging.getLogger(__name__)
 
 class GitHubTrackerImportForm(ToolImportForm):
     gh_project_name = GitHubProjectNameValidator()
-    gh_user_name = fev.UnicodeString(not_empty=True)
+    gh_user_name = v.UnicodeString(not_empty=True)
 
 
 class GitHubTrackerImportController(ToolImportController, GitHubOAuthMixin):
diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py
index d96a3c1..3cc1ba4 100644
--- a/ForgeImporters/forgeimporters/github/wiki.py
+++ b/ForgeImporters/forgeimporters/github/wiki.py
@@ -24,14 +24,12 @@ from tempfile import mkdtemp
 from shutil import rmtree
 
 import six
-from paste.deploy.converters import aslist
 
 from bs4 import BeautifulSoup
 import git
 from tg import app_globals as g
 from tg import tmpl_context as c
 from ming.orm import ThreadLocalORMSession
-from formencode import validators as fev
 from tg import (
     expose,
     flash,
@@ -43,6 +41,7 @@ from tg.decorators import (
 )
 
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib import utils
 from allura.lib.plugin import ImportIdConverter
 from allura.lib.decorators import (
@@ -71,8 +70,8 @@ log = logging.getLogger(__name__)
 
 class GitHubWikiImportForm(ToolImportForm):
     gh_project_name = GitHubProjectNameValidator()
-    gh_user_name = fev.UnicodeString(not_empty=True)
-    tool_option = fev.UnicodeString(if_missing='')
+    gh_user_name = v.UnicodeString(not_empty=True)
+    tool_option = v.UnicodeString(if_missing='')
 
 
 class GitHubWikiImportController(ToolImportController, GitHubOAuthMixin):
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index 290b6f7..a471983 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -24,6 +24,7 @@ from allura.app import Application, SitemapEntry, DefaultAdminController
 from allura import model as M
 from allura.lib.security import require_access, has_access
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib.search import search_app
 from allura.controllers import BaseController
 from allura.lib.widgets import form_fields as ffw
@@ -156,7 +157,7 @@ class RootController(BaseController):
         }
 
     @expose('jinja:forgeshorturl:templates/search.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    project=validators.StringBool(if_empty=False)))
     def search(self, q=None, project=None, limit=None, page=0, **kw):
         c.search_results = W.search_results
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 980ad5e..28c7727 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -47,6 +47,7 @@ from ming.utils import LazyProperty
 # Pyforge-specific imports
 from allura import model as M
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.lib import utils
 from allura.tasks import notification_tasks
 from allura.app import (
@@ -89,12 +90,12 @@ from six.moves import map
 log = logging.getLogger(__name__)
 
 search_validators = dict(
-    q=validators.UnicodeString(if_empty=None),
+    q=v.UnicodeString(if_empty=None),
     history=validators.StringBool(if_empty=False),
     project=validators.StringBool(if_empty=False),
     limit=validators.Int(if_invalid=None),
     page=validators.Int(if_empty=0, if_invalid=0),
-    sort=validators.UnicodeString(if_empty=None),
+    sort=v.UnicodeString(if_empty=None),
     filter=V.JsonConverter(if_empty={}, if_invalid={}),
     deleted=validators.StringBool(if_empty=False))
 
@@ -949,11 +950,11 @@ class RootController(BaseController, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgetracker:templates/tracker/mass_edit.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    filter=V.JsonConverter(if_empty={}),
                    limit=validators.Int(if_empty=10, if_invalid=10),
                    page=validators.Int(if_empty=0, if_invalid=0),
-                   sort=validators.UnicodeString(if_empty='ticket_num_i asc')))
+                   sort=v.UnicodeString(if_empty='ticket_num_i asc')))
     def edit(self, q=None, limit=None, page=None, sort=None, filter=None, **kw):
         require_access(c.app, 'update')
         result = TM.Ticket.paged_search(c.app.config, c.user, q, filter=filter,
@@ -977,11 +978,11 @@ class RootController(BaseController, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgetracker:templates/tracker/mass_move.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    filter=V.JsonConverter(if_empty={}),
                    limit=validators.Int(if_empty=10, if_invalid=10),
                    page=validators.Int(if_empty=0, if_invalid=0),
-                   sort=validators.UnicodeString(if_empty='ticket_num_i asc')))
+                   sort=v.UnicodeString(if_empty='ticket_num_i asc')))
     def move(self, q=None, limit=None, page=None, sort=None, filter=None, **kw):
         require_access(c.app, 'admin')
         result = TM.Ticket.paged_search(c.app.config, c.user, q, filter=filter,
@@ -1698,8 +1699,8 @@ class TrackerAdminController(DefaultAdminController):
     @validate(W.options_admin, error_handler=options)
     def set_options(self, **kw):
         require_access(self.app, 'configure')
-        for k, v in six.iteritems(kw):
-            self.app.config.options[k] = v
+        for k, val in six.iteritems(kw):
+            self.app.config.options[k] = val
         flash('Options updated')
         redirect(request.referer or '/')
 
@@ -1937,7 +1938,7 @@ class MilestoneController(BaseController):
     @validate(validators=dict(
         limit=validators.Int(if_invalid=None),
         page=validators.Int(if_empty=0, if_invalid=0),
-        sort=validators.UnicodeString(if_empty=''),
+        sort=v.UnicodeString(if_empty=''),
         filter=V.JsonConverter(if_empty={}),
         deleted=validators.StringBool(if_empty=False)))
     def index(self, q=None, columns=None, page=0, query=None, sort=None,
diff --git a/ForgeTracker/forgetracker/widgets/admin.py b/ForgeTracker/forgetracker/widgets/admin.py
index a36e11d..4e72838 100644
--- a/ForgeTracker/forgetracker/widgets/admin.py
+++ b/ForgeTracker/forgetracker/widgets/admin.py
@@ -20,6 +20,7 @@ from __future__ import absolute_import
 import ew.jinja2_ew as ew
 
 from formencode import validators as fev
+from allura.lib import validators as v
 from allura.lib.widgets import forms as ff
 from allura.lib.widgets import form_fields as ffw
 
@@ -61,13 +62,13 @@ class OptionsAdmin(ff.AdminForm):
             ffw.MarkdownEdit(
                 name='TicketHelpNew',
                 label='Help text to display on new ticket page',
-                validator=fev.String(),
+                validator=v.String(),
                 attrs={'style': 'width: 95%'}),
             ffw.MarkdownEdit(
                 name='TicketHelpSearch',
                 label='Help text to display on ticket list pages (index page,'
                       ' search results, milestone lists)',
-                validator=fev.String(),
+                validator=v.String(),
                 attrs={'style': 'width: 95%'}),
         ]
         return fields
diff --git a/ForgeTracker/forgetracker/widgets/bin_form.py b/ForgeTracker/forgetracker/widgets/bin_form.py
index a18cff2..31df17b 100644
--- a/ForgeTracker/forgetracker/widgets/bin_form.py
+++ b/ForgeTracker/forgetracker/widgets/bin_form.py
@@ -19,10 +19,9 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 import ew
 from ew import jinja2_ew
-from allura.lib import validators as V
+from allura.lib import validators as v
 
 from forgetracker import model
-from formencode import validators as fev
 
 
 class BinForm(ew.SimpleForm):
@@ -33,12 +32,12 @@ class BinForm(ew.SimpleForm):
 
     class hidden_fields(ew.NameList):
         _id = jinja2_ew.HiddenField(
-            validator=V.Ming(model.Bin), if_missing=None)
+            validator=v.Ming(model.Bin), if_missing=None)
 
     class fields(ew.NameList):
         summary = jinja2_ew.TextField(
             label='Bin Name',
-            validator=fev.UnicodeString(not_empty=True))
+            validator=v.UnicodeString(not_empty=True))
         terms = jinja2_ew.TextField(
             label='Search Terms',
-            validator=fev.UnicodeString(not_empty=True))
+            validator=v.UnicodeString(not_empty=True))
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index f1f04e1..fa1ddd4 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -106,7 +106,7 @@ class GenericTicketForm(ew.SimpleForm):
             ew.TextField(name='summary', label='Title',
                          attrs={'style': 'width: 425px', 'class':'memorable',
                                 'placeholder': 'Title'},
-                         validator=fev.UnicodeString(
+                         validator=v.UnicodeString(
                              not_empty=True, messages={
                                  'empty': "You must provide a Title"})),
             ffw.MarkdownEdit(label='Description', name='description',
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 75f289a..d635222 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -36,6 +36,7 @@ from ming.orm import session
 # Pyforge-specific imports
 from allura import model as M
 from allura.lib import helpers as h
+from allura.lib import validators as v
 from allura.app import Application, SitemapEntry, DefaultAdminController, ConfigOption
 from allura.lib.search import search_app
 from allura.lib.decorators import require_post, memorable_forget
@@ -402,7 +403,7 @@ class RootController(BaseController, DispatchIndex, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgewiki:templates/wiki/search.html')
-    @validate(dict(q=validators.UnicodeString(if_empty=None),
+    @validate(dict(q=v.UnicodeString(if_empty=None),
                    history=validators.StringBool(if_empty=False),
                    search_comments=validators.StringBool(if_empty=False),
                    project=validators.StringBool(if_empty=False)))
@@ -424,7 +425,7 @@ class RootController(BaseController, DispatchIndex, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgewiki:templates/wiki/browse.html')
-    @validate(dict(sort=validators.UnicodeString(if_empty='alpha'),
+    @validate(dict(sort=v.UnicodeString(if_empty='alpha'),
                    show_deleted=validators.StringBool(if_empty=False),
                    page=validators.Int(if_empty=0, if_invalid=0),
                    limit=validators.Int(if_empty=None, if_invalid=None)))
@@ -468,7 +469,7 @@ class RootController(BaseController, DispatchIndex, FeedController):
 
     @with_trailing_slash
     @expose('jinja:forgewiki:templates/wiki/browse_tags.html')
-    @validate(dict(sort=validators.UnicodeString(if_empty='alpha'),
+    @validate(dict(sort=v.UnicodeString(if_empty='alpha'),
                    page=validators.Int(if_empty=0, if_invalid=0),
                    limit=validators.Int(if_empty=None, if_invalid=None)))
     def browse_tags(self, sort='alpha', page=0, limit=None, **kw):
diff --git a/requirements.in b/requirements.in
index 494ce9a..cc30883 100644
--- a/requirements.in
+++ b/requirements.in
@@ -11,7 +11,7 @@ emoji
 faulthandler ; python_version < "3.3"
 feedgenerator
 feedparser
-# FormEncode may need v2.0 to work past py3.3 or so?  https://github.com/formencode/formencode/issues/140
+# FormEncode is not currently maintained :(  Could go to 2.0.0a currently https://github.com/formencode/formencode/issues/140
 FormEncode
 GitPython==2.1.11
 html5lib==1.0.1


[allura] 06/06: [#8361] e.message doesn't exist in py3

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit abd7d5557e56c4967142722d4d11b757c7b7cc45
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue May 12 11:56:15 2020 -0400

    [#8361] e.message doesn't exist in py3
---
 Allura/allura/lib/widgets/auth_widgets.py | 2 +-
 ForgeSVN/forgesvn/model/svn.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Allura/allura/lib/widgets/auth_widgets.py b/Allura/allura/lib/widgets/auth_widgets.py
index a257599..3e6cbfb 100644
--- a/Allura/allura/lib/widgets/auth_widgets.py
+++ b/Allura/allura/lib/widgets/auth_widgets.py
@@ -90,7 +90,7 @@ class LoginForm(ForgeForm):
                 None)
         except exc.HTTPBadRequest as e:
             raise Invalid(
-                e.message,
+                e.args[0],
                 dict(username=value['username'], rememberme=value.get('rememberme'),
                      return_to=value.get('return_to')),
                 None)
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 347e152..76ed47a 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -509,7 +509,7 @@ class SVNImplementation(M.RepositoryImplementation):
                     url, revision_start=rev, peg_revision=rev, limit=limit,
                     discover_changed_paths=True)
             except pysvn.ClientError as e:
-                if 'Unable to connect' in e.message:
+                if 'Unable to connect' in e.args[0]:
                     raise  # repo error
                 return  # no (more) history for this path
             for ci in logs:


[allura] 01/06: [#8361] templates tests pass

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 95fc826e788539e354cfdacfc02b687747805a92
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri May 8 17:10:14 2020 -0400

    [#8361] templates tests pass
---
 Allura/allura/controllers/auth.py                      |  2 ++
 Allura/allura/tests/templates/jinja_master/test_lib.py |  5 +++--
 AlluraTest/alluratest/controller.py                    | 12 ------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index f8dff10..a83604d 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -113,6 +113,8 @@ class AuthController(BaseController):
             self.disable = DisableAccountController()
 
     def __getattr__(self, name):
+        if name == 'decoration':
+            raise AttributeError("TG decoratedcontroller calls this during import time, can't do anything complex")
         urls = plugin.UserPreferencesProvider.get().additional_urls()
         if name not in urls:
             raise AttributeError("'%s' object has no attribute '%s'" % (type(self).__name__, name))
diff --git a/Allura/allura/tests/templates/jinja_master/test_lib.py b/Allura/allura/tests/templates/jinja_master/test_lib.py
index 8b27438..67c0571 100644
--- a/Allura/allura/tests/templates/jinja_master/test_lib.py
+++ b/Allura/allura/tests/templates/jinja_master/test_lib.py
@@ -21,8 +21,9 @@ from tg import config, app_globals as g
 from mock import Mock
 from nose.tools import assert_equal
 
+import ming
 from allura.config.app_cfg import ForgeConfig, AlluraJinjaRenderer
-from alluratest.controller import setup_config_test
+from alluratest.controller import setup_basic_test
 
 
 def strip_space(s):
@@ -31,7 +32,7 @@ def strip_space(s):
 
 class TemplateTest(object):
     def setUp(self):
-        setup_config_test()
+        setup_basic_test()
         self.jinja2_env = AlluraJinjaRenderer.create(config, g)['jinja'].jinja2_env
 
 
diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py
index b5e53de..2da93da 100644
--- a/AlluraTest/alluratest/controller.py
+++ b/AlluraTest/alluratest/controller.py
@@ -76,18 +76,6 @@ def get_config_file(config=None, current_pkg=None):
         return conf_file
 
 
-def setup_config_test(config_file=None, force=False):
-    '''
-    This may be necessary to use within test setup that needs the app config loaded
-    '''
-    if not config_file:
-        config_file = get_config_file()
-    already_loaded = tg.config.get('tg.app_globals')
-    if not already_loaded or force:
-        loadapp('config:' + config_file)
-setup_config_test.__test__ = False
-
-
 def setup_basic_test(config=None, app_name=DFL_APP_NAME):
     '''
     Create clean environment for running tests, includes mongodb connection with "mim" (mongo-in-memory) and sample


[allura] 03/06: [#8361] test_admin fixes; MaxBytesValidator should not convert

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 4b3f53b58b6a53d55a38abdee1aa3385b5ae0d06
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon May 11 18:11:37 2020 -0400

    [#8361] test_admin fixes; MaxBytesValidator should not convert
---
 Allura/allura/lib/validators.py              |  4 ++--
 Allura/allura/tests/decorators.py            | 14 +++++++++----
 Allura/allura/tests/functional/test_admin.py | 31 ++++++++++++++--------------
 Allura/allura/tests/functional/test_auth.py  |  4 ++--
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/Allura/allura/lib/validators.py b/Allura/allura/lib/validators.py
index cd29024..f84ec5a 100644
--- a/Allura/allura/lib/validators.py
+++ b/Allura/allura/lib/validators.py
@@ -117,8 +117,8 @@ class MaxBytesValidator(fev.FancyValidator):
     max = 255
 
     def _to_python(self, value, state):
-        value = h.really_unicode(value or '').encode('utf-8')
-        if len(value) > self.max:
+        value_bytes = h.really_unicode(value or '').encode('utf-8')
+        if len(value_bytes) > self.max:
             raise fe.Invalid("Please enter a value less than %s bytes long." %
                              self.max, value, state)
         return value
diff --git a/Allura/allura/tests/decorators.py b/Allura/allura/tests/decorators.py
index 647674f..0a48ae7 100644
--- a/Allura/allura/tests/decorators.py
+++ b/Allura/allura/tests/decorators.py
@@ -173,11 +173,17 @@ def audits(*messages, **kwargs):
         preamble = '(Done by user: {}\n)?IP Address: {}\nUser-Agent: {}\n'.format(actor, ip_addr, user_agent)
     else:
         preamble = ''
+
     for message in messages:
-        assert M.AuditLog.query.find(dict(message=re.compile(preamble + message))).count(), \
-            'Could not find "%s"%s' % (message,
-                                       '\nYou may need to escape the regex chars in the text you are matching'
-                                       if message != re.escape(message) else '')
+        found = M.AuditLog.query.find(dict(message=re.compile(preamble + message))).count()
+        if not found:
+            hints = ''
+            all = M.AuditLog.query.find().all()
+            if len(all) < 10:
+                hints += '\nin these AuditLog messages:\n\t' + '\n\t'.join(a.message for a in all)
+            if message != re.escape(message):
+                hints += '\nYou may need to escape the regex chars in the text you are matching'
+            raise AssertionError('Could not find "%s"%s' % (message, hints))
 
 
 @contextlib.contextmanager
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 15f862e..b02294b 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -20,8 +20,6 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 import os
 from datetime import datetime
-
-import allura
 import pkg_resources
 from io import BytesIO
 import logging
@@ -34,7 +32,9 @@ from ming.orm.ormsession import ThreadLocalORMSession
 from tg import expose
 from tg import tmpl_context as c, app_globals as g
 import mock
+import six
 
+import allura
 from allura.tests import TestController
 from allura.tests import decorators as td
 from allura.tests.decorators import audits, out_audits
@@ -59,12 +59,13 @@ class TestProjectAdmin(TestController):
                 'change summary to Milkshakes are for crazy monkeys',
                 'change project name to My Test Project',
                 'change short description to (\u00bf A Test Project \?){45}'):
-            self.app.post('/admin/update', status=302, params=dict(
+            r = self.app.post('/admin/update', params=dict(
                 name='My Test Project',
                 shortname='test',
                 summary='Milkshakes are for crazy monkeys',
                 short_description=('\u00bf A Test Project ?' * 45).encode('utf-8'),
                 labels='aaa,bbb'))
+            assert r.status_int == 302, (r.status, r.html.select('.error,.fielderror'))
         r = self.app.get('/admin/overview')
         assert b'A Test Project ?\xc2\xbf A' in r.body
         assert 'Test Subproject' not in r
@@ -168,7 +169,7 @@ class TestProjectAdmin(TestController):
     def test_features(self):
         proj = M.Project.query.get(shortname='test')
         assert_equals(proj.features, [])
-        with audits("change project features to \[u'One', u'Two'\]"):
+        with audits("change project features to \[{u}'One', {u}'Two'\]".format(u='u' if six.PY2 else '')):
             resp = self.app.post('/admin/update', params={
                 'features-0.feature': 'One',
                 'features-1.feature': '  ',
@@ -838,10 +839,10 @@ class TestProjectAdmin(TestController):
         dev_holder = r.html.find('table', {'id': 'usergroup_admin'}).findAll('tr')[2]
         mem_holder = r.html.find('table', {'id': 'usergroup_admin'}).findAll('tr')[3]
         mem_id = mem_holder['data-group']
-        # neither group has update permission
-        assert dev_holder.findAll('ul')[1].findAll('li')[2]['class'] == ["no"]
-        assert mem_holder.findAll('ul')[1].findAll('li')[2]['class'] == ["no"]
-        # add update permission to Member
+        # neither group has create permission
+        assert dev_holder.select_one('li[data-permission=create]')['class'] == ["no"]
+        assert mem_holder.select_one('li[data-permission=create]')['class'] == ["no"]
+        # add create permission to Member
         r = self.app.post('/admin/groups/change_perm', params={
             'role_id': mem_id,
             'permission': 'create',
@@ -849,10 +850,10 @@ class TestProjectAdmin(TestController):
         r = self.app.get('/admin/groups/')
         dev_holder = r.html.find('table', {'id': 'usergroup_admin'}).findAll('tr')[2]
         mem_holder = r.html.find('table', {'id': 'usergroup_admin'}).findAll('tr')[3]
-        # Member now has update permission
-        assert mem_holder.findAll('ul')[1].findAll('li')[2]['class'] == ["yes"]
-        # Developer has inherited update permission from Member
-        assert dev_holder.findAll('ul')[1].findAll('li')[2]['class'] == ["inherit"]
+        # Member now has create permission
+        assert mem_holder.select_one('li[data-permission=create]')['class'] == ["yes"]
+        # Developer has inherited create permission from Member
+        assert dev_holder.select_one('li[data-permission=create]')['class'] == ["inherit"]
         # remove update permission from Member
         r = self.app.post('/admin/groups/change_perm', params={
             'role_id': mem_id,
@@ -861,9 +862,9 @@ class TestProjectAdmin(TestController):
         r = self.app.get('/admin/groups/')
         dev_holder = r.html.find('table', {'id': 'usergroup_admin'}).findAll('tr')[2]
         mem_holder = r.html.find('table', {'id': 'usergroup_admin'}).findAll('tr')[3]
-        # neither group has update permission
-        assert dev_holder.findAll('ul')[1].findAll('li')[2]['class'] == ["no"]
-        assert mem_holder.findAll('ul')[1].findAll('li')[2]['class'] == ["no"]
+        # neither group has create permission
+        assert dev_holder.select_one('li[data-permission=create]')['class'] == ["no"]
+        assert mem_holder.select_one('li[data-permission=create]')['class'] == ["no"]
 
     def test_permission_inherit(self):
         r = self.app.get('/admin/groups/')
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index 3d922b6..5d2688c 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -861,9 +861,9 @@ class TestAuth(TestController):
         field_name = None
         for k, v in six.iteritems(form.fields):
             if subscribed:
-                check = c and v[0].value == 'on'
+                check = v and v[0].value == 'on'
             else:
-                check = c and v[0].value != 'on'
+                check = v and v[0].value != 'on'
             if k and k.endswith('.subscribed') and check:
                 field_name = k.replace('.subscribed', '')
         assert field_name, "Can't find unsubscribed tool for user"


[allura] 05/06: [#8361] work around formencode problems with Files/bytes

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e65b783da0259e25fa14c025940f38b04e66572b
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue May 12 11:55:21 2020 -0400

    [#8361] work around formencode problems with Files/bytes
---
 Allura/allura/lib/validators.py    |  6 ++++++
 Allura/allura/lib/widgets/forms.py | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/Allura/allura/lib/validators.py b/Allura/allura/lib/validators.py
index 2dee7fc..37e6cb2 100644
--- a/Allura/allura/lib/validators.py
+++ b/Allura/allura/lib/validators.py
@@ -458,6 +458,12 @@ def convertTime(timestring):
 
 class IconValidator(fev.FancyValidator):
     regex = '(jpg|jpeg|gif|png|bmp)$'
+
+    # https://github.com/formencode/formencode/issues/101 local fix
+    # formencode is_empty doesn't handle empty bytestring by default
+    def is_empty(self, val):
+        return val == b'' or super(IconValidator, self).is_empty(val)
+
     def _to_python(self, value, state):
         p = re.compile(self.regex, flags=re.I)
         result = p.search(value.filename)
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 54082ce..d79b3ae 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -125,6 +125,20 @@ class ForgeForm(ew.SimpleForm):
                                                          ctx['errors'])
         return Markup(display)
 
+    # https://github.com/formencode/formencode/issues/101 local fix
+    def _make_schema(self):
+        schema = super(ForgeForm, self)._make_schema()
+
+        orig_val_is_iter = schema._value_is_iterator
+
+        def _value_is_iterator(val):
+            if isinstance(val, bytes):
+                return False
+            return orig_val_is_iter(val)
+        schema._value_is_iterator = _value_is_iterator
+
+        return schema
+
 
 class ForgeFormResponsive(ForgeForm):
     def __init__(self):


[allura] 02/06: [#8361] only strings for dispatch paths

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 7a9105201b131c6c57fd39c41755719348d4093b
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri May 8 17:19:48 2020 -0400

    [#8361] only strings for dispatch paths
---
 Allura/allura/controllers/rest.py           | 6 +++++-
 Allura/allura/tests/functional/test_root.py | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py
index a243f62..ee6548e 100644
--- a/Allura/allura/controllers/rest.py
+++ b/Allura/allura/controllers/rest.py
@@ -309,6 +309,10 @@ def nbhd_lookup_first_path(nbhd, name, current_user, remainder, api=False):
     prefix = nbhd.shortname_prefix
     pname = unquote(name)
     pname = six.ensure_text(pname)  # we don't support unicode names, but in case a url comes in with one
+    try:
+        pname.encode('ascii')
+    except UnicodeError:
+        raise exc.HTTPNotFound
     provider = plugin.ProjectRegistrationProvider.get()
     try:
         provider.shortname_validator.to_python(pname, check_allowed=False, neighborhood=nbhd)
@@ -324,7 +328,7 @@ def nbhd_lookup_first_path(nbhd, name, current_user, remainder, api=False):
     if project is None:
         # look for neighborhood tools matching the URL
         project = nbhd.neighborhood_project
-        return project, (pname.encode('utf-8'),) + remainder  # include pname in new remainder, it is actually the nbhd tool path
+        return project, (pname,) + remainder  # include pname in new remainder, it is actually the nbhd tool path
     if project and prefix == 'u/':
         # make sure user-projects are associated with an enabled user
         user = project.user_project_of
diff --git a/Allura/allura/tests/functional/test_root.py b/Allura/allura/tests/functional/test_root.py
index 014c093..a9cecb0 100644
--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -31,6 +31,8 @@ Please read http://pythonpaste.org/webtest/ for more information.
 from __future__ import unicode_literals
 from __future__ import absolute_import
 import os
+
+import six
 from six.moves.urllib.parse import quote
 
 from tg import tmpl_context as c
@@ -103,8 +105,9 @@ class TestRootController(TestController):
             self.app.get('/', headers=dict(Accept=str(hdr)), validate_skip=True)
 
     def test_encoded_urls(self):
-        # not valid unicode
-        self.app.get(b'/foo\xFF', status=400)
+        if six.PY2:
+            # not valid unicode
+            self.app.get(b'/foo\xFF', status=400)
         self.app.get('/foo%FF', status=400)
         # encoded
         self.app.get('/foo%C3%A9', status=404)