mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
fix syntax errors and import issue for compat
This commit is contained in:
parent
8adad94f47
commit
d37f2286b1
4 changed files with 6 additions and 7 deletions
|
@ -1931,7 +1931,7 @@ class Feed(models.Model):
|
||||||
signed_urls = [create_imageproxy_signed_url(settings.IMAGES_URL,
|
signed_urls = [create_imageproxy_signed_url(settings.IMAGES_URL,
|
||||||
settings.IMAGES_SECRET_KEY,
|
settings.IMAGES_SECRET_KEY,
|
||||||
url) for url in urls]
|
url) for url in urls]
|
||||||
return dict(zip(urls, signed_urls)))
|
return dict(zip(urls, signed_urls))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def secure_image_thumbnails(cls, urls, size=192):
|
def secure_image_thumbnails(cls, urls, size=192):
|
||||||
|
@ -1939,7 +1939,7 @@ class Feed(models.Model):
|
||||||
settings.IMAGES_SECRET_KEY,
|
settings.IMAGES_SECRET_KEY,
|
||||||
url,
|
url,
|
||||||
size) for url in urls]
|
size) for url in urls]
|
||||||
return dict(zip(urls, signed_urls)))
|
return dict(zip(urls, signed_urls))
|
||||||
|
|
||||||
def get_tags(self, entry):
|
def get_tags(self, entry):
|
||||||
fcat = []
|
fcat = []
|
||||||
|
|
|
@ -440,7 +440,7 @@ def _urljoin(base, uri):
|
||||||
try:
|
try:
|
||||||
uri = urllib.parse.urljoin(base, uri)
|
uri = urllib.parse.urljoin(base, uri)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
uri = ''"
|
uri = ''
|
||||||
if not isinstance(uri, str):
|
if not isinstance(uri, str):
|
||||||
return uri.decode('utf-8', 'ignore')
|
return uri.decode('utf-8', 'ignore')
|
||||||
return uri
|
return uri
|
||||||
|
|
6
vendor/paypal/standard/widgets.py
vendored
6
vendor/paypal/standard/widgets.py
vendored
|
@ -14,7 +14,7 @@ class ValueHiddenInput(forms.HiddenInput):
|
||||||
|
|
||||||
def render(self, name, value, attrs=None):
|
def render(self, name, value, attrs=None):
|
||||||
if value is None:
|
if value is None:
|
||||||
return ''"
|
return ''
|
||||||
else:
|
else:
|
||||||
return super(ValueHiddenInput, self).render(name, value, attrs)
|
return super(ValueHiddenInput, self).render(name, value, attrs)
|
||||||
|
|
||||||
|
@ -27,8 +27,8 @@ class ReservedValueHiddenInput(ValueHiddenInput):
|
||||||
|
|
||||||
def render(self, name, value, attrs=None):
|
def render(self, name, value, attrs=None):
|
||||||
if value is None:
|
if value is None:
|
||||||
value = ''"
|
value = ''
|
||||||
final_attrs = self.build_attrs(attrs, {"type": self.input_type})
|
final_attrs = self.build_attrs(attrs, {"type": self.input_type})
|
||||||
if value != ''":
|
if value != '':
|
||||||
final_attrs['value'] = force_text(value)
|
final_attrs['value'] = force_text(value)
|
||||||
return mark_safe('<input%s />' % flatatt(final_attrs))
|
return mark_safe('<input%s />' % flatatt(final_attrs))
|
||||||
|
|
1
vendor/paypalapi/settings.py
vendored
1
vendor/paypalapi/settings.py
vendored
|
@ -9,7 +9,6 @@ import logging
|
||||||
import os
|
import os
|
||||||
from pprint import pformat
|
from pprint import pformat
|
||||||
|
|
||||||
from vendor.paypalapi.compat import str
|
|
||||||
from vendor.paypalapi.exceptions import PayPalConfigError
|
from vendor.paypalapi.exceptions import PayPalConfigError
|
||||||
|
|
||||||
logger = logging.getLogger('paypal.settings')
|
logger = logging.getLogger('paypal.settings')
|
||||||
|
|
Loading…
Add table
Reference in a new issue