You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2020/06/03 16:05:28 UTC

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

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

kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 829ce8bfa0ba5a14aeda36e49216d31973811ff9
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: