Skip to content

Commit

Permalink
prepare 0.13.4
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Aug 11, 2018
1 parent 11e50d1 commit 9798b7e
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 17 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

0.13.4
------
2018-08-11

- Django 2.1 support (initial).

0.13.3
------
2018-07-10
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ handling the submitted form data).

Prerequisites
=============
- Django 1.8, 1.9, 1.10, 1.11 and 2.0.
- Python 2.7, 3.4, 3.5, 3.6 and PyPy.
- Django 1.8, 1.9, 1.10, 1.11, 2.0 and 2.1.
- Python 2.7, 3.4, 3.5, 3.6, 3.7 and PyPy.

Key concepts
============
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

0.13.4
------
2018-08-11

- Django 2.1 support (initial).

0.13.3
------
2018-07-10
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ handling the submitted form data).

Prerequisites
=============
- Django 1.8, 1.9, 1.10, 1.11 and 2.0.
- Python 2.7, 3.4, 3.5, 3.6 and PyPy.
- Django 1.8, 1.9, 1.10, 1.11, 2.0 and 2.1.
- Python 2.7, 3.4, 3.5, 3.6, 3.7 and PyPy.

Key concepts
============
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
getattr(settings, 'DEBUG_TOOLBAR', False):
import debug_toolbar

if versions.DJANGO_GTE_2_1:
if versions.DJANGO_GTE_2_2:
urlpatterns = [
url(r'^__debug__/', debug_toolbar.urls),
] + urlpatterns
Expand Down
10 changes: 10 additions & 0 deletions requirements/django_2_1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
django-autoslug-iplweb
django-formtools>=2.0
django-nine>=0.1.13
django-nonefield>=0.3
easy-thumbnails>=2.5.0
Pillow>=2.0.0
requests>=1.0.0
six>=1.9
Unidecode>=0.04.1
vishap>=0.1.5,<2.0
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
'django-autoslug-iplweb',
'django-formtools>=2.0',
'django-nine>=0.1.13',
'django-nonefield>=0.1',
'django-nonefield>=0.3',
# 'ordereddict>=1.1',
'Pillow>=2.0.0',
'requests>=1.0.0',
Expand Down Expand Up @@ -394,13 +394,12 @@
"customisable, modular, user- and developer- friendly.",
long_description="{0}{1}".format(readme, screenshots),
classifiers=[
# "Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
# "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Environment :: Web Environment",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"License :: OSI Approved :: GNU Lesser General Public License v2 or "
Expand Down
4 changes: 2 additions & 2 deletions src/fobi/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2752,14 +2752,14 @@ def __new__(cls, name, bases, attrs):
)
return new_class

def render(self, name, value, attrs=None):
def render(self, name, value, attrs=None, **kwargs):
"""Smart render."""
widget = plugin.get_widget()
if widget.hasattr('render') and callable(widget.render):
return widget.render(name, value, attrs=attrs)
else:
super(DeclarativeMetaclass, self).render(
name, value, attrs=attrs
name, value, attrs=attrs, **kwargs
)

class WrappedWidget(with_metaclass(DeclarativeMetaclass, base_class)):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ def get_form_field_instances(self, request=None, form_entry=None,
'widget': Textarea(attrs=widget_attrs)
}

if self.data.max_length is not None:
# if self.data.max_length is not None:
if self.data.max_length:
field_kwargs['max_length'] = self.data.max_length
else:
field_kwargs['max_length'] = None
field_kwargs['max_length'] = None

return [(self.data.name, CharField, field_kwargs)]
7 changes: 5 additions & 2 deletions src/fobi/contrib/plugins/form_handlers/mail/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ def prep_value(self, value):
return MULTI_EMAIL_FIELD_VALUE_SPLITTER.join(value)
raise ValidationError('Invalid format.')

def render(self, name, value, attrs=None):
def render(self, name, value, attrs=None, **kwargs):
"""Render."""
value = self.prep_value(value)
return super(MultiEmailWidget, self).render(name, value, attrs)
return super(MultiEmailWidget, self).render(name,
value,
attrs,
**kwargs)
2 changes: 1 addition & 1 deletion src/fobi/reusable/markdown_widget/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
class MarkdownWidget(Textarea):
"""Markdown widget based on remarkable."""

def render(self, name, value, attrs=None):
def render(self, name, value, attrs=None, **kwargs):
if value is None:
value = ''

Expand Down
7 changes: 4 additions & 3 deletions src/fobi/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ def __init__(self, attrs=None, choices=(), prepend_html=None,
else None
super(RichSelect, self).__init__(attrs=attrs, choices=choices)

def render(self, name, value, attrs=None):
def render(self, name, value, attrs=None, **kwargs):
"""Renders the element, having prepended and appended extra parts."""
if self.override_name is not None:
name = self.override_name

rendered_select = super(RichSelect, self).render(
name=name,
value=value,
attrs=attrs
attrs=attrs,
**kwargs
)

return mark_safe(
Expand All @@ -114,7 +115,7 @@ class RichSelectInverseQuotes(RichSelect):
'rich_select_inverse_option.html'

elif versions.DJANGO_GTE_1_10:
def render(self, name, value, attrs=None):
def render(self, name, value, attrs=None, **kwargs):
if self.override_name is not None:
name = self.override_name

Expand Down

0 comments on commit 9798b7e

Please sign in to comment.