diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index ec4356f546..c9dd6d7d30 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -251,7 +251,7 @@ def items_for_result(cl, result, form): else: url = add_preserved_filters({'preserved_filters': cl.preserved_filters, 'opts': cl.opts}, url) # Convert the pk to something that can be used in Javascript. - # Problem cases are long ints (23L) and non-ASCII strings. + # Problem cases are non-ASCII strings. if cl.to_field: attr = str(cl.to_field) else: diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index f7bf850309..48e4ac7e7d 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -421,10 +421,7 @@ Once you're in the shell, explore the :doc:`database API `:: # Save the object into the database. You have to call save() explicitly. >>> q.save() - # Now it has an ID. Note that this might say "1L" instead of "1", depending - # on which database you're using. That's no biggie; it just means your - # database backend prefers to return integers as Python long integer - # objects. + # Now it has an ID. >>> q.id 1 diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 2008e65b95..b135532b2d 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -722,7 +722,7 @@ For each field, we describe the default widget used if you don't specify * Default widget: :class:`NumberInput` when :attr:`Field.localize` is ``False``, else :class:`TextInput`. * Empty value: ``None`` - * Normalizes to: A Python integer or long integer. + * Normalizes to: A Python integer. * Validates that the given value is an integer. Leading and trailing whitespace is allowed, as in Python's ``int()`` function. * Error message keys: ``required``, ``invalid``, ``max_value``, diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 18e81a7da8..2893c91b8e 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1974,11 +1974,6 @@ should always use ``count()`` rather than loading all of the record into Python objects and calling ``len()`` on the result (unless you need to load the objects into memory anyway, in which case ``len()`` will be faster). -Depending on which database you're using (e.g. PostgreSQL vs. MySQL), -``count()`` may return a long integer instead of a normal Python integer. This -is an underlying implementation quirk that shouldn't pose any real-world -problems. - Note that if you want the number of items in a ``QuerySet`` and are also retrieving model instances from it (for example, by iterating over it), it's probably more efficient to use ``len(queryset)`` which won't cause an extra diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt index 3910d31321..5b872cb584 100644 --- a/docs/topics/migrations.txt +++ b/docs/topics/migrations.txt @@ -653,7 +653,7 @@ for basic values, and doesn't specify import paths). Django can serialize the following: -- ``int``, ``long``, ``float``, ``bool``, ``str``, ``unicode``, ``bytes``, ``None`` +- ``int``, ``float``, ``bool``, ``str``, ``unicode``, ``bytes``, ``None`` - ``list``, ``set``, ``tuple``, ``dict`` - ``datetime.date``, ``datetime.time``, and ``datetime.datetime`` instances (include those that are timezone-aware)