website Changeset - 2d078b0004fb · Conservancy Kallithea

Parent rev.

Child rev.

[Not reviewed]

0 10 0

Ben Sturmfels (bsturmfels) - 2 years ago 2021-11-29 20:55:45
ben@sturm.com.au

Apply `futurize --stage-2` Python 2/3 compatibility transformations.

These changes specifically require the use of the "future" library.

10 files changed with 31 insertions and 17 deletions:

www/conservancy/__init__.py

www/conservancy/apps/blog/models.py

www/conservancy/apps/events/view_helpers.py

www/conservancy/apps/fundgoal/models.py

www/conservancy/apps/news/models.py

www/conservancy/apps/news/templatetags/fill_url.py

www/conservancy/bsoup.py

www/conservancy/local_context_processors.py

www/conservancy/static/views.py

www/modpythoncustom.py

0 comments (0 inline, 0 general)

www/conservancy/__init__.py

➞

Show inline comments

		from past.builtins import basestring
		from builtins import object

www/conservancy/apps/blog/models.py

➞

Show inline comments

 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
 from django.db import models
@@ ... / @@ -67,6 +70,6 @@ class Entry(models.Model, bsoup.SoupModelMixin): @@
-        import xmlrpclib
+        import xmlrpc.client
         # Ping Technorati
-        j = xmlrpclib.Server('http://rpc.technorati.com/rpc/ping')
+        j = xmlrpc.client.Server('http://rpc.technorati.com/rpc/ping')
         reply = j.weblogUpdates.ping(blog_name, blog_url)
@@ ... / @@ -74,3 +77,3 @@ class Entry(models.Model, bsoup.SoupModelMixin): @@
         # Ping Google Blog Search
-        j = xmlrpclib.Server('http://blogsearch.google.com/ping/RPC2')
+        j = xmlrpc.client.Server('http://blogsearch.google.com/ping/RPC2')
         reply = j.weblogUpdates.ping(blog_name, blog_url, post_url)

www/conservancy/apps/events/view_helpers.py

➞

Show inline comments

@@ ... / @@ -17,3 +17,3 @@ def organize_media_by_event(eventmedia_queryset): @@
             'media_list': ', '.join(set(y.get_format_display() for y in x))}
            for x in media_by_event.values()]
+           for x in list(media_by_event.values())]
     mbe.sort(key=(lambda x: x['date']), reverse=True) # sort by date

www/conservancy/apps/fundgoal/models.py

➞

Show inline comments

 from __future__ import division
 from past.utils import old_div
 from builtins import object
@@ ... / @@ -19,3 +21,3 @@ class FundraisingGoal(models.Model): @@
     def percentage_there(self):
-        return (self.fundraiser_so_far_amount / self.fundraiser_goal_amount ) * 100
+        return (old_div(self.fundraiser_so_far_amount, self.fundraiser_goal_amount) ) * 100

www/conservancy/apps/news/models.py

➞

Show inline comments

 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
@@ ... / @@ -56,6 +58,6 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): @@
-        import xmlrpclib
+        import xmlrpc.client
         # Ping Technorati
-        j = xmlrpclib.Server('http://rpc.technorati.com/rpc/ping')
+        j = xmlrpc.client.Server('http://rpc.technorati.com/rpc/ping')
         reply = j.weblogUpdates.ping(blog_name, blog_url)
@@ ... / @@ -63,3 +65,3 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): @@
         # Ping Google Blog Search
-        j = xmlrpclib.Server('http://blogsearch.google.com/ping/RPC2')
+        j = xmlrpc.client.Server('http://blogsearch.google.com/ping/RPC2')
         reply = j.weblogUpdates.ping(blog_name, blog_url, post_url)

www/conservancy/apps/news/templatetags/fill_url.py

➞

Show inline comments

 import urlparse
 from future import standard_library
 standard_library.install_aliases()
 from builtins import zip
 import urllib.parse
@@ ... / @@ -15,5 +18,5 @@ def fill_url(given_url, base_url): @@
     """
     given_parts = urlparse.urlsplit(given_url)
     base_parts = urlparse.urlsplit(base_url)
     return urlparse.urlunsplit(
     given_parts = urllib.parse.urlsplit(given_url)
     base_parts = urllib.parse.urlsplit(base_url)
     return urllib.parse.urlunsplit(
         given_part or base_part for given_part, base_part in zip(given_parts, base_parts)

www/conservancy/bsoup.py

➞

Show inline comments

@@ ... / @@ -2,2 +2,3 @@ @@
 from builtins import filter
 from builtins import object
@@ ... / @@ -146,3 +147,3 @@ class SoupModelMixin(object): @@
     def _sort_and_slice_elems(self, elem_seq, elem_key, pred, *slice_args):
-        seq = itertools.ifilter(pred, sorted(elem_seq, key=elem_key))
+        seq = filter(pred, sorted(elem_seq, key=elem_key))
         if slice_args:

www/conservancy/local_context_processors.py

➞

Show inline comments

@@ ... / @@ -24,5 +24,5 @@ if conservancy.settings.FORCE_CANONICAL_HOSTNAME: @@
     def host_url(request):
         return _HOST_URL_VAR
+        return _HOST_URL_VAR.decode('utf-8')
 else:
     def host_url(request):
         return {'host_url': request.build_absolute_uri('/').rstrip('/')}
+        return {'host_url': request.build_absolute_uri('/').rstrip('/').decode('utf-8')}

www/conservancy/static/views.py

➞

Show inline comments

		from builtins import str
		import mimetypes

www/modpythoncustom.py

➞

Show inline comments

 from builtins import str
 from mod_python import apache
@@ ... / @@ -85,6 +86,6 @@ class ModPythonHandler(BaseHandler): @@
         req.content_type = response['Content-Type']
         for key, value in response.items():
+        for key, value in list(response.items()):
             if key != 'content-type':
                 req.headers_out[str(key)] = str(value)
         for c in response.cookies.values():
+        for c in list(response.cookies.values()):
             req.headers_out.add('Set-Cookie', c.output(header=''))

0 comments (0 inline, 0 general)