diff options
Diffstat (limited to 'views.patch')
| -rw-r--r-- | views.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/views.patch b/views.patch deleted file mode 100644 index 6b973dc0890a..000000000000 --- a/views.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- django_ical/views.py.old 2015-07-15 15:06:34.969228732 +0200 -+++ django_ical/views.py 2015-07-15 15:06:42.705891733 +0200 -@@ -11,6 +11,10 @@ - from django.core.exceptions import ObjectDoesNotExist - from django.contrib.syndication.views import Feed - from django.utils.http import http_date -+try: -+ from django.utils import six -+except ImportError: -+ import six - - from django_ical import feedgenerator - -@@ -94,22 +98,21 @@ - - def _get_dynamic_attr(self, attname, obj, default=None): - """ -- Copied from django.contrib.syndication.views.Feed -+ Copied from django.contrib.syndication.views.Feed (v1.7.1) - """ - try: - attr = getattr(self, attname) - except AttributeError: - return default - if callable(attr): -- # Check func_code.co_argcount rather than try/excepting the -- # function and catching the TypeError, because something inside -- # the function may raise the TypeError. This technique is more -- # accurate. -- if hasattr(attr, 'func_code'): -- argcount = attr.func_code.co_argcount -- else: -- argcount = attr.__call__.func_code.co_argcount -- if argcount == 2: # one argument is 'self' -+ # Check co_argcount rather than try/excepting the function and -+ # catching the TypeError, because something inside the function -+ # may raise the TypeError. This technique is more accurate. -+ try: -+ code = six.get_function_code(attr) -+ except AttributeError: -+ code = six.get_function_code(attr.__call__) -+ if code.co_argcount == 2: # one argument is 'self' - return attr(obj) - else: - return attr() |