fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some cleaning.
[wolnelektury.git]
/
apps
/
catalogue
/
utils.py
diff --git
a/apps/catalogue/utils.py
b/apps/catalogue/utils.py
index
a0e834c
..
91e782e
100644
(file)
--- a/
apps/catalogue/utils.py
+++ b/
apps/catalogue/utils.py
@@
-14,7
+14,6
@@
from django.http import HttpResponse
from django.core.files.uploadedfile import UploadedFile
from django.core.files.storage import DefaultStorage
from django.utils.encoding import force_unicode
from django.core.files.uploadedfile import UploadedFile
from django.core.files.storage import DefaultStorage
from django.utils.encoding import force_unicode
-from django.utils.translation import get_language
from django.conf import settings
from os import mkdir, path, unlink
from errno import EEXIST, ENOENT
from django.conf import settings
from os import mkdir, path, unlink
from errno import EEXIST, ENOENT
@@
-155,7
+154,7
@@
class MultiQuerySet(object):
def __getitem__(self, item):
try:
def __getitem__(self, item):
try:
-
indices =
(offset, stop, step) = item.indices(self.count())
+ (offset, stop, step) = item.indices(self.count())
except AttributeError:
# it's not a slice - make it one
return self[item : item + 1][0]
except AttributeError:
# it's not a slice - make it one
return self[item : item + 1][0]
@@
-178,14
+177,14
@@
class SortedMultiQuerySet(MultiQuerySet):
self.order_by = kwargs.pop('order_by', None)
self.sortfn = kwargs.pop('sortfn', None)
if self.order_by is not None:
self.order_by = kwargs.pop('order_by', None)
self.sortfn = kwargs.pop('sortfn', None)
if self.order_by is not None:
- self.sortfn = lambda a, b: cmp(
getattr(a,
self.order_by),
-
getattr(b,
self.order_by))
+ self.sortfn = lambda a, b: cmp(
(getattr(a, f) for f in
self.order_by),
+
(getattr(b, f) for f in
self.order_by))
super(SortedMultiQuerySet, self).__init__(*args, **kwargs)
def __getitem__(self, item):
sort_heads = [0] * len(self.querysets)
try:
super(SortedMultiQuerySet, self).__init__(*args, **kwargs)
def __getitem__(self, item):
sort_heads = [0] * len(self.querysets)
try:
-
indices =
(offset, stop, step) = item.indices(self.count())
+ (offset, stop, step) = item.indices(self.count())
except AttributeError:
# it's not a slice - make it one
return self[item : item + 1][0]
except AttributeError:
# it's not a slice - make it one
return self[item : item + 1][0]
@@
-349,10
+348,5
@@
This can sometimes occupy lots of memory, so trim it here a bit.
or []
or []
-def related_tag_name(tag_info, language=None):
- return tag_info.get("name_%s" % (language or get_language()),
- tag_info.get("name_%s" % settings.LANGUAGE_CODE, ""))
-
-
def delete_from_cache_by_language(cache, key_template):
cache.delete_many([key_template % lc for lc, ln in settings.LANGUAGES])
def delete_from_cache_by_language(cache, key_template):
cache.delete_many([key_template % lc for lc, ln in settings.LANGUAGES])