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 2022/06/29 18:46:23 UTC
[allura] branch master updated (39ffddf20 -> b4d5e1c15)
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
from 39ffddf20 Better detection of empty wiki pages
new cfcde7880 clean up some py2-only special methods
new b4d5e1c15 Latest pip/setuptools so travis builds ok
The 2 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.
Summary of changes:
.travis.yml | 1 +
Allura/allura/lib/utils.py | 2 --
Allura/allura/model/repository.py | 7 ++-----
3 files changed, 3 insertions(+), 7 deletions(-)
[allura] 01/02: clean up some py2-only special methods
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit cfcde7880391d3236f25c760e9fd75ad60abeadb
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Jun 29 14:43:50 2022 -0400
clean up some py2-only special methods
---
Allura/allura/lib/utils.py | 2 --
Allura/allura/model/repository.py | 7 ++-----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 4edd6b55c..63045c259 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -405,8 +405,6 @@ class TruthyCallable:
def __bool__(self):
return self.callable()
- __nonzero__ = __bool__ # python 2
-
class TransformedDict(collections.MutableMapping):
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 24543ff59..0c2239ccc 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -1569,9 +1569,6 @@ class EmptyBlob(Blob):
def size(self):
return 0
- def __nonzero__(self):
- return False
-
def __bool__(self):
return False
@@ -1933,7 +1930,7 @@ class GitLikeTree:
for name, oid in self.blobs.items()]
return six.ensure_str('\n'.join(sorted(lines)))
- def __unicode__(self):
+ def __str__(self):
return self.pretty_tree(recurse=False)
def pretty_tree(self, indent=0, recurse=True, show_id=True):
@@ -1944,7 +1941,7 @@ class GitLikeTree:
for name, t in sorted(self.trees.items())]
lines += [' ' * indent + 'b {} {}'.format(name, oid if show_id else '')
for name, oid in sorted(self.blobs.items())]
- output = h.really_unicode('\n'.join(lines)).encode('utf-8')
+ output = h.really_unicode('\n'.join(lines))
return output
[allura] 02/02: Latest pip/setuptools so travis builds ok
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit b4d5e1c15f0a7c1e2eb658ed361dacc36b110159
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Jun 29 14:46:06 2022 -0400
Latest pip/setuptools so travis builds ok
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index b8ab86958..e8511f751 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ jobs:
- pip install https://sourceforge.net/projects/pysvn/files/pysvn/V1.9.12/pysvn-1.9.12.tar.gz
install:
- sudo apt-get install -qq libjpeg8-dev zlib1g-dev
+ - pip install --upgrade setuptools pip
- pip install nose
- pip install -r requirements.txt --no-deps --upgrade --upgrade-strategy=only-if-needed
- npm ci