Drop patch 0002-Deepcopy-params.patch: applied upstream.

3 files changed, 1 insertions, 55 deletions

diff --git a/debian/changelog b/debian/changelog
index cbae3ac..1f8c7d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ python-vobject (0.9.2-1) UNRELEASED; urgency=medium
   * Add myself to uploaders.
   * New upstream release.
   * Refresh patch 0001-don-t-install-ics_diff.patch.
+  * Drop patch 0002-Deepcopy-params.patch: applied upstream.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 09 Apr 2016 12:28:20 +0000
 
diff --git a/debian/patches/0002-Deepcopy-params.patch b/debian/patches/0002-Deepcopy-params.patch
deleted file mode 100644
index 1e2269e..0000000
--- a/debian/patches/0002-Deepcopy-params.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Morgen Sagen <sagen@apple.com>
-Date: Mon, 4 Jan 2010 20:26:58 +0100
-Subject: Deepcopy params
-
----
- vobject/base.py |   14 +++++++++-----
- 1 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/vobject/base.py b/vobject/base.py
-index b56c36a..40baf1e 100644
---- a/vobject/base.py
-+++ b/vobject/base.py
-@@ -284,6 +284,8 @@ class ContentLine(VBase):
-         self.value = copy.copy(copyit.value)
-         self.encoded = self.encoded
-         self.params = copy.copy(copyit.params)
-+        for k,v in self.params.items():
-+            self.params[k] = copy.copy(v)
-         self.singletonparams = copy.copy(copyit.singletonparams)
-         self.lineNumber = copyit.lineNumber
-         
-@@ -627,16 +629,16 @@ class Component(VBase):
-         print
- 
- class VObjectError(Exception):
--    def __init__(self, message, lineNumber=None):
--        self.message = message
-+    def __init__(self, msg, lineNumber=None):
-+        self.msg = msg
-         if lineNumber is not None:
-             self.lineNumber = lineNumber
-     def __str__(self):
-         if hasattr(self, 'lineNumber'):
-             return "At line %s: %s" % \
--                   (self.lineNumber, self.message)
-+                   (self.lineNumber, self.msg)
-         else:
--            return repr(self.message)
-+            return repr(self.msg)
- 
- class ParseError(VObjectError):
-     pass
-@@ -953,7 +955,9 @@ def defaultSerialize(obj, buf, lineLength):
-         if obj.group is not None:
-             s.write(obj.group + '.')
-         s.write(obj.name.upper())
--        for key, paramvals in obj.params.iteritems():
-+        keys = sorted(obj.params.iterkeys())
-+        for key in keys:
-+            paramvals = obj.params[key]
-             s.write(';' + key + '=' + ','.join(dquoteEscape(p) for p in paramvals))
-         s.write(':' + obj.value)
-         if obj.behavior and not startedEncoded: obj.behavior.decode(obj)
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 5eeb1d1..c5209a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-don-t-install-ics_diff.patch
-0002-Deepcopy-params.patch
 0003-Treat-untils-as-floating.patch
 0004-Normalise-year-info-to-be-within-Python-s-year-bound.patch