From d37f2286b15df24bae8f4e011ce68e5c37f73592 Mon Sep 17 00:00:00 2001 From: Jonathan Math Date: Fri, 19 Jun 2020 02:35:30 -0400 Subject: [PATCH] fix syntax errors and import issue for compat --- apps/rss_feeds/models.py | 4 ++-- utils/feedparser.py | 2 +- vendor/paypal/standard/widgets.py | 6 +++--- vendor/paypalapi/settings.py | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index c86a91722..76a256ba0 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -1931,7 +1931,7 @@ class Feed(models.Model): signed_urls = [create_imageproxy_signed_url(settings.IMAGES_URL, settings.IMAGES_SECRET_KEY, url) for url in urls] - return dict(zip(urls, signed_urls))) + return dict(zip(urls, signed_urls)) @classmethod def secure_image_thumbnails(cls, urls, size=192): @@ -1939,7 +1939,7 @@ class Feed(models.Model): settings.IMAGES_SECRET_KEY, url, size) for url in urls] - return dict(zip(urls, signed_urls))) + return dict(zip(urls, signed_urls)) def get_tags(self, entry): fcat = [] diff --git a/utils/feedparser.py b/utils/feedparser.py index 00caa13b2..64a54b04f 100644 --- a/utils/feedparser.py +++ b/utils/feedparser.py @@ -440,7 +440,7 @@ def _urljoin(base, uri): try: uri = urllib.parse.urljoin(base, uri) except ValueError: - uri = ''" + uri = '' if not isinstance(uri, str): return uri.decode('utf-8', 'ignore') return uri diff --git a/vendor/paypal/standard/widgets.py b/vendor/paypal/standard/widgets.py index 4203f7054..eb3de1a7f 100755 --- a/vendor/paypal/standard/widgets.py +++ b/vendor/paypal/standard/widgets.py @@ -14,7 +14,7 @@ class ValueHiddenInput(forms.HiddenInput): def render(self, name, value, attrs=None): if value is None: - return ''" + return '' else: return super(ValueHiddenInput, self).render(name, value, attrs) @@ -27,8 +27,8 @@ class ReservedValueHiddenInput(ValueHiddenInput): def render(self, name, value, attrs=None): if value is None: - value = ''" + value = '' final_attrs = self.build_attrs(attrs, {"type": self.input_type}) - if value != ''": + if value != '': final_attrs['value'] = force_text(value) return mark_safe('' % flatatt(final_attrs)) diff --git a/vendor/paypalapi/settings.py b/vendor/paypalapi/settings.py index b608896b8..92788b751 100755 --- a/vendor/paypalapi/settings.py +++ b/vendor/paypalapi/settings.py @@ -9,7 +9,6 @@ import logging import os from pprint import pformat -from vendor.paypalapi.compat import str from vendor.paypalapi.exceptions import PayPalConfigError logger = logging.getLogger('paypal.settings')