diff options
author | Guido Guenther <agx@sigxcpu.org> | 2006-10-11 09:07:10 +0200 |
---|---|---|
committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2006-10-11 09:07:10 +0200 |
commit | 6456e6dfe28312cface5a7ba4ac696c49274de69 (patch) | |
tree | 056a5b8edec75447e2238c74488e5a45c5a4efac /debian/patches | |
parent | c1cfd4754b88796a1c53135618e11057a6ba1001 (diff) |
drop all patches, applied upstream
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/base.patch | 74 | ||||
-rw-r--r-- | debian/patches/icalendar.patch | 74 | ||||
-rw-r--r-- | debian/patches/series | 2 |
3 files changed, 0 insertions, 150 deletions
diff --git a/debian/patches/base.patch b/debian/patches/base.patch deleted file mode 100644 index 72fbc47..0000000 --- a/debian/patches/base.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: src/vobject/base.py -=================================================================== ---- src/vobject/base.py (revision 155) -+++ src/vobject/base.py (working copy) -@@ -1,5 +1,6 @@ - """vobject module for reading vCard and vCalendar files.""" - -+import copy - import re - import sys - import logging -@@ -56,6 +57,12 @@ - self.parentBehavior = None - self.isNative = False - -+ def copy(self, copyit): -+ self.group = copyit.group -+ self.behavior = copyit.behavior -+ self.parentBehavior = copyit.parentBehavior -+ self.isNative = copyit.isNative -+ - def validate(self, *args, **kwds): - """Call the behavior's validate method, or return True.""" - if self.behavior: -@@ -250,6 +257,21 @@ - if qp: - self.value = str(self.value).decode('quoted-printable') - -+ @classmethod -+ def duplicate(clz, copyit): -+ newcopy = clz('', {}, '') -+ newcopy.copy(copyit) -+ return newcopy -+ -+ def copy(self, copyit): -+ super(ContentLine, self).copy(copyit) -+ self.name = copyit.name -+ self.value = copy.copy(copyit.value) -+ self.encoded = self.encoded -+ self.params = copy.copy(copyit.params) -+ self.singletonparams = copy.copy(copyit.singletonparams) -+ self.lineNumber = copyit.lineNumber -+ - def __eq__(self, other): - try: - return (self.name == other.name) and (self.params == other.params) and (self.value == other.value) -@@ -361,6 +383,27 @@ - - self.autoBehavior() - -+ @classmethod -+ def duplicate(clz, copyit): -+ newcopy = clz() -+ newcopy.copy(copyit) -+ return newcopy -+ -+ def copy(self, copyit): -+ super(Component, self).copy(copyit) -+ -+ # deep copy of contents -+ self.contents = {} -+ for key, lvalue in copyit.contents.items(): -+ newvalue = [] -+ for value in lvalue: -+ newitem = value.duplicate(value) -+ newvalue.append(newitem) -+ self.contents[key] = newvalue -+ -+ self.name = copyit.name -+ self.useBegin = copyit.useBegin -+ - def setProfile(self, name): - """Assign a PROFILE to this unnamed component. - diff --git a/debian/patches/icalendar.patch b/debian/patches/icalendar.patch deleted file mode 100644 index cdfde36..0000000 --- a/debian/patches/icalendar.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: src/vobject/icalendar.py -=================================================================== ---- src/vobject/icalendar.py (revision 155) -+++ src/vobject/icalendar.py (working copy) -@@ -377,8 +377,17 @@ - try: - dtstart = self.dtstart.value - except AttributeError, KeyError: -- # if there's no dtstart, just return None -- return None -+ # Special for VTODO - try DUE property instead -+ try: -+ if self.name == "VTODO": -+ dtstart = self.due.value -+ else: -+ # if there's no dtstart, just return None -+ return None -+ except AttributeError, KeyError: -+ # if there's no due, just return None -+ return None -+ - # rrulestr complains about unicode, so cast to str - rule = dateutil.rrule.rrulestr(str(line.value), - dtstart=dtstart) -@@ -422,7 +431,16 @@ - return rruleset - - def setrruleset(self, rruleset): -- dtstart = self.dtstart.value -+ -+ # Get DTSTART from component (or DUE if no DTSTART in a VTODO) -+ try: -+ dtstart = self.dtstart.value -+ except AttributeError, KeyError: -+ if self.name == "VTODO": -+ dtstart = self.due.value -+ else: -+ raise -+ - isDate = datetime.date == type(dtstart) - if isDate: - dtstart = datetime.datetime(dtstart.year,dtstart.month, dtstart.day) -@@ -580,6 +598,8 @@ - if obj.value.tzinfo is None: - obj.params['X-VOBJ-FLOATINGTIME-ALLOWED'] = ['TRUE'] - if obj.params.get('TZID'): -+ # Keep a copy of the original TZID around -+ obj.params['X-VOBJ-ORIGINAL-TZID'] = obj.params['TZID'] - del obj.params['TZID'] - return obj - -@@ -592,6 +612,10 @@ - obj.value = dateTimeToString(obj.value, cls.forceUTC) - if not cls.forceUTC and tzid is not None: - obj.tzid_param = tzid -+ if obj.params.get('X-VOBJ-ORIGINAL-TZID'): -+ if not hasattr(obj, 'tzid_param'): -+ obj.tzid_param = obj.params['X-VOBJ-ORIGINAL-TZID'] -+ del obj.params['X-VOBJ-ORIGINAL-TZID'] - - return obj - -@@ -612,7 +636,10 @@ - obj.value=str(obj.value) - obj.value=parseDtstart(obj) - if getattr(obj, 'value_param', 'DATE-TIME').upper() == 'DATE-TIME': -- if hasattr(obj, 'tzid_param'): del obj.tzid_param -+ if hasattr(obj, 'tzid_param'): -+ # Keep a copy of the original TZID around -+ obj.params['X-VOBJ-ORIGINAL-TZID'] = obj.tzid_param -+ del obj.tzid_param - return obj - - @staticmethod diff --git a/debian/patches/series b/debian/patches/series index e576710..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -base.patch -p0 -icalendar.patch -p0 |