diff --git a/python-Pympler-issue22.patch b/python-Pympler-issue22.patch deleted file mode 100644 index 3350ac4..0000000 --- a/python-Pympler-issue22.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up Pympler-0.4.2/test/asizeof/test_asizeof.py.issue22 Pympler-0.4.2/test/asizeof/test_asizeof.py ---- Pympler-0.4.2/test/asizeof/test_asizeof.py.issue22 2015-07-10 22:26:07.000000000 +0200 -+++ Pympler-0.4.2/test/asizeof/test_asizeof.py 2015-08-10 15:17:18.706890083 +0200 -@@ -68,40 +68,6 @@ def test_flatsize(failf=None, stdf=None) - return len(t), e - - --if hasattr(sys, 'getsizeof'): -- -- class AsizeofTest(unittest.TestCase): -- -- def _failf(self, fmt, *args): -- self.fail(fmt % args) -- -- def test_flatsize_vs_getsizeof(self): -- '''Test asizeof.flatsize() vs sys.getsizeof() -- ''' -- # run all the tests, report failures -- n, e = test_flatsize(failf=self._failf) # stdf=sys.stderr) -- # no tests ran? -- self.assert_(n, msg='zero tests ran in %r' % test_flatsize) -- # no unexpected failures? -- self.assert_(not e, msg='%s failures in %s tests' % (e, n)) -- --else: -- -- class AsizeofTest(unittest.TestCase): -- -- def test_flatsize(self): -- '''Test asizeof.flatsize() -- ''' -- l = ["spam", 2, 3, 4, "eggs", 6, 7, 8] -- for _type in (list, tuple, set, frozenset): -- data = _type(l) -- bsz = asizeof.basicsize(data) -- isz = asizeof.itemsize(data) -- lng = asizeof.leng(data) -- fsz = asizeof.flatsize(data) -- self.assertEqual(fsz, bsz + (lng * isz), (fsz, bsz, lng, isz)) -- -- self.assertRaises(ValueError, asizeof.flatsize, l, **{'align': 3}) - - - class Foo(object): diff --git a/python-Pympler-use-system-bottle.patch b/python-Pympler-use-system-bottle.patch deleted file mode 100644 index 67e0e88..0000000 --- a/python-Pympler-use-system-bottle.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up Pympler-0.4.3/pympler/web.py.bottle Pympler-0.4.3/pympler/web.py ---- Pympler-0.4.3/pympler/web.py.bottle 2015-12-14 18:05:15.000000000 +0100 -+++ Pympler-0.4.3/pympler/web.py 2016-05-17 13:50:16.051307071 +0200 -@@ -38,7 +38,10 @@ from pympler import asizeof - from pympler.garbagegraph import GarbageGraph - from pympler.process import get_current_threads, ProcessMemoryInfo - --from pympler.util import bottle -+try: -+ import bottle -+except ImportError: -+ from pympler.util import bottle - from pympler.util.compat import dumps - from pympler.util.stringutils import safe_repr -