Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Django4 #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Django4 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
656e3b3
switching to smart_str
blocher Feb 18, 2022
73f6757
bumping python version to 3.10
blocher Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,6 @@ venv.bak/

# mypy
.mypy_cache/

# JetBrains
.idea/
4 changes: 2 additions & 2 deletions django_inlinecss/templatetags/inlinecss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from __future__ import unicode_literals

from django import template
from django.utils.encoding import smart_text
from django.utils.encoding import smart_str

from django_inlinecss import conf

Expand All @@ -23,7 +23,7 @@ def render(self, context):
for expression in self.filter_expressions:
path = expression.resolve(context, True)
if path is not None:
path = smart_text(path)
path = smart_str(path)

css_loader = conf.get_css_loader()()
css = ''.join((css, css_loader.load(path)))
Expand Down
6 changes: 5 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
URL = 'https://github.com/roverdotcom/django-inlinecss'
EMAIL = '[email protected]'
AUTHOR = 'Philip Kimmey'
REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.7'
REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.11'
VERSION = None

# What packages are required for this module to be executed?
Expand Down Expand Up @@ -140,6 +140,10 @@ def run(self):
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Topic :: Communications :: Email',
'Topic :: Text Processing :: Markup :: HTML',
],
Expand Down