diff --git a/.gitignore b/.gitignore
index 984568a3b3..fc6eb78d0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ htmlcov/
.ropeproject
__pycache__/
_static/
+.idea
diff --git a/src/tixlbase/cache.py b/src/tixlbase/cache.py
index 4efd0bf72c..7a30a9525d 100644
--- a/src/tixlbase/cache.py
+++ b/src/tixlbase/cache.py
@@ -38,7 +38,8 @@ class EventRelatedCache:
key = hashlib.sha256(key.encode("UTF-8")).hexdigest()
return key
- def _strip_prefix(self, key):
+ @staticmethod
+ def _strip_prefix(key):
return key.split(":", 3)[-1] if 'event:' in key else key
def clear(self):
diff --git a/src/tixlbase/middleware.py b/src/tixlbase/middleware.py
index 7967e16649..b0f0cefe79 100644
--- a/src/tixlbase/middleware.py
+++ b/src/tixlbase/middleware.py
@@ -7,8 +7,7 @@ from django.utils.translation.trans_real import (
get_supported_language_variant,
parse_accept_lang_header,
language_code_re,
- check_for_language,
- _supported
+ check_for_language
)
from django.utils.translation import LANGUAGE_SESSION_KEY
from django.utils import translation, timezone
@@ -17,6 +16,8 @@ from django.utils.cache import patch_vary_headers
from tixlbase.models import Event
+_supported = None
+
class LocaleMiddleware(BaseLocaleMiddleware):
diff --git a/src/tixlbase/models.py b/src/tixlbase/models.py
index 8bba4a65ed..71ce5e64c8 100644
--- a/src/tixlbase/models.py
+++ b/src/tixlbase/models.py
@@ -88,7 +88,7 @@ class User(AbstractBaseUser, PermissionsMixin):
is_active = models.BooleanField(default=True,
verbose_name=_('Is active'))
is_staff = models.BooleanField(default=False,
- verbose_name=('Is site admin'))
+ verbose_name=_('Is site admin'))
date_joined = models.DateTimeField(auto_now_add=True,
verbose_name=_('Date joined'))
locale = models.CharField(max_length=50,
@@ -97,7 +97,7 @@ class User(AbstractBaseUser, PermissionsMixin):
verbose_name=_('Language'))
timezone = models.CharField(max_length=100,
default=settings.TIME_ZONE,
- verbose_name=('Timezone'))
+ verbose_name=_('Timezone'))
objects = UserManager()
diff --git a/src/tixlbase/types.py b/src/tixlbase/types.py
index 4f222f5b55..62cc361ff6 100644
--- a/src/tixlbase/types.py
+++ b/src/tixlbase/types.py
@@ -30,17 +30,31 @@ class VariationDict(dict):
def identify(self):
"""
- Build an identifier for this dict. This can be any string used to
- compare one VariationDict to others.
+ Build a simple and unique identifier for this dict. This can be any string
+ used to compare one VariationDict to others.
In the current implementation, it is a string containing a list of
the PropertyValue id's, sorted by the Property id's and is therefore
unique among one item.
"""
order_key = lambda i: i[0]
- return ",".join([
+ return ",".join((
str(v[1].pk) for v in sorted(self.relevant_items(), key=order_key)
- ])
+ ))
+
+ def key(self):
+ """
+ Build an identifier for this dict which exactly specifies the combination
+ for this variation without any doubt. This can be used to "talk" about a
+ variation in network communication.
+
+ In the current implementation, it is a string containing a list of
+ the propertyid:valueid tuples without any specific order and is therefore
+ not useful to compare two VariationDicts for equality.
+ """
+ return ",".join((
+ str(v[0]) + ":" + str(v[1].pk) for v in self.relevant_items()
+ ))
def __eq__(self, other):
if type(other) is type(self):
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/categories.html b/src/tixlcontrol/templates/tixlcontrol/items/categories.html
index f5168b54d0..99b7feb420 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/categories.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/categories.html
@@ -35,7 +35,7 @@
- |
+ |
{% endfor %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/properties.html b/src/tixlcontrol/templates/tixlcontrol/items/properties.html
index 57cc9c1ddc..9c92d6dbe2 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/properties.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/properties.html
@@ -30,7 +30,7 @@
{% for p in properties %}
| {{ p.name }} |
- |
+ |
{% endfor %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/questions.html b/src/tixlcontrol/templates/tixlcontrol/items/questions.html
index b655071be8..0e958d819c 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/questions.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/questions.html
@@ -32,7 +32,7 @@
| {{ q.question }} |
{{ q.get_type_display }} |
- |
+ |
{% endfor %}
diff --git a/src/tixlcontrol/views/forms.py b/src/tixlcontrol/views/forms.py
index 0f9e6d6ce3..b40934fedd 100644
--- a/src/tixlcontrol/views/forms.py
+++ b/src/tixlcontrol/views/forms.py
@@ -27,6 +27,8 @@ class TolerantFormsetModelForm(forms.ModelForm):
# Always assume data has changed if validation fails.
self._changed_data.append(name)
continue
+ # We're using a private API of Django here. This is not nice, but no problem as it seems
+ # like this will become a public API in Django 1.7.
if field._has_changed(initial_value, data_value):
return True
return False
diff --git a/src/tixlplugins/timerestriction/signals.py b/src/tixlplugins/timerestriction/signals.py
index 4b805c1a78..e9e1c41442 100644
--- a/src/tixlplugins/timerestriction/signals.py
+++ b/src/tixlplugins/timerestriction/signals.py
@@ -88,8 +88,7 @@ def availability_handler(sender, **kwargs):
if 'variation' not in v or v['variation'] not in applied_to:
continue
- if (restriction.timeframe_from <= now()
- and restriction.timeframe_to >= now()):
+ if (restriction.timeframe_from <= now() <= restriction.timeframe_to):
# Selling this item is currently possible
available = True
# If multiple time frames are currently active, make sure to