From 5d3017ff0bb5f154d7c637d65a3db2b8879c9aa8 Mon Sep 17 00:00:00 2001 From: Jardel Weyrich Date: Mon, 22 Nov 2010 05:47:46 -0200 Subject: [PATCH] Convert files to UNIX EOL and remove BOM. Please, add these lines to your ~/.gitconfig file: [core] autocrlf = input Or alternatively run: git config --global core.autocrlf input --- LICENSE | 4 ++-- MANIFEST.in | 8 ++++---- README | 8 ++++---- TODO | 2 +- django_tables/__init__.py | 2 +- django_tables/app/templatetags/tables.py | 4 ++-- django_tables/columns.py | 2 +- django_tables/options.py | 2 +- docs/features/index.rst | 2 +- docs/features/pagination.rst | 2 +- docs/installation.rst | 2 +- docs/types/index.rst | 2 +- docs/types/memory.rst | 2 +- docs/types/models.rst | 2 +- docs/types/sql.rst | 2 +- tests/__init__.py | 2 +- tests/test_basic.py | 2 +- tests/test_memory.py | 2 +- tests/test_models.py | 2 +- tests/test_templates.py | 2 +- tests/testapp/models.py | 2 +- 21 files changed, 29 insertions(+), 29 deletions(-) diff --git a/LICENSE b/LICENSE index 953b038..a1eb278 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2008, Michael Elsdörfer +Copyright (c) 2008, Michael Elsdörfer All rights reserved. Redistribution and use in source and binary forms, with or without @@ -24,4 +24,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +POSSIBILITY OF SUCH DAMAGE. diff --git a/MANIFEST.in b/MANIFEST.in index 0e2ba0e..208f9d5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include README -include LICENSE -include MANIFEST.in -recursive-include tests *.py \ No newline at end of file +include README +include LICENSE +include MANIFEST.in +recursive-include tests *.py diff --git a/README b/README index 2bc8b81..2c28c87 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -django-tables - a Django QuerySet renderer. - -Documentation: - http://elsdoerfer.name/docs/django-tables/ +django-tables - a Django QuerySet renderer. + +Documentation: + http://elsdoerfer.name/docs/django-tables/ diff --git a/TODO b/TODO index af169c3..159c80c 100644 --- a/TODO +++ b/TODO @@ -117,4 +117,4 @@ have subclasses for each model class, even if it just redirects to use the correct filter class; If not using django-filter, we wouldn't have different filter types; filters -would just hold the data, and each column would know how to apply it. \ No newline at end of file +would just hold the data, and each column would know how to apply it. diff --git a/django_tables/__init__.py b/django_tables/__init__.py index 12ea230..76d8069 100644 --- a/django_tables/__init__.py +++ b/django_tables/__init__.py @@ -4,4 +4,4 @@ __version__ = (0, 3, 'dev') from memory import * from models import * from columns import * -from options import * \ No newline at end of file +from options import * diff --git a/django_tables/app/templatetags/tables.py b/django_tables/app/templatetags/tables.py index 7dc6803..ba1922e 100644 --- a/django_tables/app/templatetags/tables.py +++ b/django_tables/app/templatetags/tables.py @@ -1,4 +1,4 @@ -""" +""" Allows setting/changing/removing of chosen url query string parameters, while maintaining any existing others. @@ -68,4 +68,4 @@ def do_seturlparam(parser, token): raise template.TemplateSyntaxError, "Argument syntax wrong: should be key=value" return SetUrlParamNode(qschanges) -register.tag('set_url_param', do_seturlparam) \ No newline at end of file +register.tag('set_url_param', do_seturlparam) diff --git a/django_tables/columns.py b/django_tables/columns.py index 70ae897..3307f09 100644 --- a/django_tables/columns.py +++ b/django_tables/columns.py @@ -82,4 +82,4 @@ class TextColumn(Column): pass class NumberColumn(Column): - pass \ No newline at end of file + pass diff --git a/django_tables/options.py b/django_tables/options.py index 069a831..57331fb 100644 --- a/django_tables/options.py +++ b/django_tables/options.py @@ -15,4 +15,4 @@ __all__ = ('options',) # raised instead. class DefaultOptions(object): IGNORE_INVALID_OPTIONS = True -options = DefaultOptions() \ No newline at end of file +options = DefaultOptions() diff --git a/docs/features/index.rst b/docs/features/index.rst index abada5a..e3e0a27 100644 --- a/docs/features/index.rst +++ b/docs/features/index.rst @@ -8,4 +8,4 @@ This section will explain some specific features in more detail. :maxdepth: 1 ordering - pagination \ No newline at end of file + pagination diff --git a/docs/features/pagination.rst b/docs/features/pagination.rst index 30217c1..7640ffe 100644 --- a/docs/features/pagination.rst +++ b/docs/features/pagination.rst @@ -44,4 +44,4 @@ Note that due to the abstraction layer that ``django-tables`` represents, it is not necessary to use Django's ``QuerySetPaginator`` with model tables. Since the table knows that it holds a queryset, it will automatically choose to use count() to determine the data length (which is exactly what -``QuerySetPaginator`` would do). \ No newline at end of file +``QuerySetPaginator`` would do). diff --git a/docs/installation.rst b/docs/installation.rst index 2df888b..93bc128 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -12,4 +12,4 @@ Running the test suite ---------------------- The test suite uses nose: - http://somethingaboutorange.com/mrl/projects/nose/ \ No newline at end of file + http://somethingaboutorange.com/mrl/projects/nose/ diff --git a/docs/types/index.rst b/docs/types/index.rst index 02b20e0..1aaac35 100644 --- a/docs/types/index.rst +++ b/docs/types/index.rst @@ -9,4 +9,4 @@ Different types of tables are available: MemoryTable - uses dicts as the data source ModelTable - wraps around a Django Model - SqlTable - is based on a raw SQL query \ No newline at end of file + SqlTable - is based on a raw SQL query diff --git a/docs/types/memory.rst b/docs/types/memory.rst index d43d7a1..ae09ae7 100644 --- a/docs/types/memory.rst +++ b/docs/types/memory.rst @@ -17,4 +17,4 @@ table cell. Similarily, the colunn default value may also be callable that will take the row instance as an argument (representing the row that the default is -needed for). \ No newline at end of file +needed for). diff --git a/docs/types/models.rst b/docs/types/models.rst index b4e782d..699a2f5 100644 --- a/docs/types/models.rst +++ b/docs/types/models.rst @@ -131,4 +131,4 @@ If you are using callables (e.g. for the ``default`` or ``data`` column options), they will generally be run when a row is accessed, and possible repeatedly when accessed more than once. This behavior differs from memory tables, where they would be called once, when the table is -generated. \ No newline at end of file +generated. diff --git a/docs/types/sql.rst b/docs/types/sql.rst index a21eb88..6f12f47 100644 --- a/docs/types/sql.rst +++ b/docs/types/sql.rst @@ -6,4 +6,4 @@ This table is backed by an SQL query that you specified. It'll help you ensure that pagination and sorting options are properly reflected in the query. -**Currently not implemented yet.** \ No newline at end of file +**Currently not implemented yet.** diff --git a/tests/__init__.py b/tests/__init__.py index 85fb830..db2ee0d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,3 +1,3 @@ # make django-tables available for import for tests import os, sys -sys.path.append(os.path.join(os.path.dirname(__file__), '..')) \ No newline at end of file +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) diff --git a/tests/test_basic.py b/tests/test_basic.py index 151951d..fda93f3 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -142,4 +142,4 @@ def test_pagination(): assert books.page.has_next() == True # exceptions are converted into 404s assert_raises(Http404, books.paginate, Paginator, 10, page=9999) - assert_raises(Http404, books.paginate, Paginator, 10, page="abc") \ No newline at end of file + assert_raises(Http404, books.paginate, Paginator, 10, page="abc") diff --git a/tests/test_memory.py b/tests/test_memory.py index 315a697..fe5ef6b 100644 --- a/tests/test_memory.py +++ b/tests/test_memory.py @@ -347,4 +347,4 @@ def test_column_order(): books.order_by = 'id,-pages' assert [c.is_ordered for c in books.columns] == [True, False, True, False] assert [c.is_ordered_reverse for c in books.columns] == [False, False, True, False] - assert [c.is_ordered_straight for c in books.columns] == [True, False, False, False] \ No newline at end of file + assert [c.is_ordered_straight for c in books.columns] == [True, False, False, False] diff --git a/tests/test_models.py b/tests/test_models.py index 21d5bac..0b3f79a 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -361,4 +361,4 @@ def test_pagination(): assert len(connection.queries)-start_querycount == 2 # reset - settings.DEBUG = False \ No newline at end of file + settings.DEBUG = False diff --git a/tests/test_templates.py b/tests/test_templates.py index b056770..a8b04a8 100644 --- a/tests/test_templates.py +++ b/tests/test_templates.py @@ -1,4 +1,4 @@ -"""Test template specific functionality. +"""Test template specific functionality. Make sure tables expose their functionality to templates right. This generally about testing "out"-functionality of the tables, whether diff --git a/tests/testapp/models.py b/tests/testapp/models.py index 157f5f5..7bedc38 100644 --- a/tests/testapp/models.py +++ b/tests/testapp/models.py @@ -1 +1 @@ -"""Empty demo app our tests can assign models to.""" \ No newline at end of file +"""Empty demo app our tests can assign models to.""" -- 2.26.2