Merge pull request #860 from jdufresne/ws
Trim trailing white space throughout the project
This commit is contained in:
commit
dc4d6d5c05
|
@ -71,4 +71,3 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
|
|||
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
|
||||
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
|
||||
|
|
6
LICENSE
6
LICENSE
|
@ -4,10 +4,10 @@ All rights reserved.
|
|||
Redistribution and use in source and binary forms, with or without modification,
|
||||
are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ Widgets
|
|||
|
||||
.. autoclass:: import_export.widgets.DurationWidget
|
||||
:members:
|
||||
|
||||
|
||||
.. autoclass:: import_export.widgets.JSONWidget
|
||||
:members:
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ Changelog
|
|||
|
||||
- JSONWidget for jsonb fields (#803)
|
||||
|
||||
- Add ExportActionMixin (#809)
|
||||
- Add ExportActionMixin (#809)
|
||||
|
||||
- Add Import Export Permissioning #608 (#804)
|
||||
|
||||
|
@ -166,7 +166,7 @@ Changelog
|
|||
|
||||
- Append rows to Result object via function call to allow overriding (#462)
|
||||
|
||||
- Add get_resource_kwargs to allow passing request to resource (#457)
|
||||
- Add get_resource_kwargs to allow passing request to resource (#457)
|
||||
|
||||
- Expose Django user to get_export_data() and export() (#447)
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ class ExportViewMixin(object):
|
|||
|
||||
|
||||
class ExportViewFormMixin(ExportViewMixin, FormView):
|
||||
def form_valid(self, form):
|
||||
def form_valid(self, form):
|
||||
formats = self.get_export_formats()
|
||||
file_format = formats[
|
||||
int(form.cleaned_data['file_format'])
|
||||
|
|
|
@ -269,7 +269,7 @@ class SimpleArrayWidget(Widget):
|
|||
def render(self, value, obj=None):
|
||||
return self.separator.join(six.text_type(v) for v in value)
|
||||
|
||||
|
||||
|
||||
class JSONWidget(Widget):
|
||||
"""
|
||||
Widget for a JSON object (especially required for jsonb fields in PostgreSQL database.)
|
||||
|
@ -310,7 +310,7 @@ class ForeignKeyWidget(Widget):
|
|||
|
||||
from import_export import fields, resources
|
||||
from import_export.widgets import ForeignKeyWidget
|
||||
|
||||
|
||||
class BookResource(resources.ModelResource):
|
||||
author = fields.Field(
|
||||
column_name='author',
|
||||
|
|
|
@ -64,7 +64,7 @@ class ImportExportAdminIntegrationTest(TestCase):
|
|||
response = self.client.post('/admin/core/book/process_import/', data,
|
||||
follow=True)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response,
|
||||
self.assertContains(response,
|
||||
_('Import finished, with {} new and {} updated {}.').format(
|
||||
1, 0, Book._meta.verbose_name_plural)
|
||||
)
|
||||
|
@ -101,7 +101,7 @@ class ImportExportAdminIntegrationTest(TestCase):
|
|||
response = self.client.post('/admin/core/book/process_import/', data,
|
||||
follow=True)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response,
|
||||
self.assertContains(response,
|
||||
_('Import finished, with {} new and {} updated {}.').format(
|
||||
1, 0, Book._meta.verbose_name_plural)
|
||||
)
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue