Merge remote branch 'jweyrich/master'

miracle2k · miracle2k · commit 02ecf618eebc · 2010-11-22T16:01:00.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-﻿Copyright (c) 2008, Michael Elsdörfer <http://elsdoerfer.name>
+Copyright (c) 2008, Michael Elsdörfer <http://elsdoerfer.name>
 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.
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README
-include LICENSE
-include MANIFEST.in
-recursive-include tests *.py
+include README
+include LICENSE
+include MANIFEST.in
+recursive-include tests *.py
diff --git 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
@@ -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.
+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
@@ -4,4 +4,4 @@
 from memory import *
 from models import *
 from columns import *
-from options import *
+from options import *
diff --git 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)
+register.tag('set_url_param', do_seturlparam)
diff --git a/django_tables/columns.py b/django_tables/columns.py
@@ -82,4 +82,4 @@ class TextColumn(Column):
     pass
 
 class NumberColumn(Column):
-    pass
+    pass
diff --git a/django_tables/options.py b/django_tables/options.py
@@ -15,4 +15,4 @@
 # raised instead.
 class DefaultOptions(object):
     IGNORE_INVALID_OPTIONS = True
-options = DefaultOptions()
+options = DefaultOptions()
diff --git 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
+   pagination
diff --git 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).
+``QuerySetPaginator`` would do).
diff --git 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/
+    http://somethingaboutorange.com/mrl/projects/nose/
diff --git 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 <memory>
    ModelTable - wraps around a Django Model <models>
-   SqlTable - is based on a raw SQL query <sql>
+   SqlTable - is based on a raw SQL query <sql>
diff --git 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).
+needed for).
diff --git 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.
+generated.
diff --git 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.**
+**Currently not implemented yet.**
diff --git 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__), '..'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -142,4 +142,4 @@ class BookTable(TestTable):
     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")
+    assert_raises(Http404, books.paginate, Paginator, 10, page="abc")
diff --git a/tests/test_memory.py b/tests/test_memory.py
@@ -347,4 +347,4 @@ class BookTable(tables.MemoryTable):
     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]
+    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
@@ -361,4 +361,4 @@ class Meta:
     assert len(connection.queries)-start_querycount == 2
 
     # reset
-    settings.DEBUG = False
+    settings.DEBUG = False
diff --git 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
@@ -1 +1 @@
-"""Empty demo app our tests can assign models to."""
+"""Empty demo app our tests can assign models to."""

-Original file line number
+Diff line change
     pass
 class NumberColumn(Column):
 -    pass
 +    pass