0

Initial Python 3 port

Many things work, some don't. Notably, genPOI doesn't work, and
there's some signedness comparison stuff going on in the C extension.

This also completely drops support for Python 2, as maintaining a C
extension for both Python 2 and 3 is a pain and not worth it for the
9 months that Python 2 is still going to be supported upstream.

The documentation needs to be adjusted as well.

All of the few tests we have pass, and rendering a map works, both
with a configuration file and without. We can also use optimizeimages.

Concerns #1528.
This commit is contained in:
Nicolas F
2019-03-16 20:43:25 +01:00
parent 99eebd5b69
commit e348a548b6
33 changed files with 369 additions and 625 deletions

View File

@@ -9,15 +9,15 @@ class TestLRU(unittest.TestCase):
def test_single_insert(self):
self.lru[1] = 2
self.assertEquals(self.lru[1], 2)
self.assertEqual(self.lru[1], 2)
def test_multiple_insert(self):
self.lru[1] = 2
self.lru[3] = 4
self.lru[5] = 6
self.assertEquals(self.lru[1], 2)
self.assertEquals(self.lru[3], 4)
self.assertEquals(self.lru[5], 6)
self.assertEqual(self.lru[1], 2)
self.assertEqual(self.lru[3], 4)
self.assertEqual(self.lru[5], 6)
def test_full(self):
self.lru[1] = 'asdf'
@@ -27,11 +27,11 @@ class TestLRU(unittest.TestCase):
self.lru[5] = 'asdf'
self.lru[6] = 'asdf'
self.assertRaises(KeyError, self.lru.__getitem__, 1)
self.assertEquals(self.lru[2], 'asdf')
self.assertEquals(self.lru[3], 'asdf')
self.assertEquals(self.lru[4], 'asdf')
self.assertEquals(self.lru[5], 'asdf')
self.assertEquals(self.lru[6], 'asdf')
self.assertEqual(self.lru[2], 'asdf')
self.assertEqual(self.lru[3], 'asdf')
self.assertEqual(self.lru[4], 'asdf')
self.assertEqual(self.lru[5], 'asdf')
self.assertEqual(self.lru[6], 'asdf')
def test_lru(self):
self.lru[1] = 'asdf'
@@ -40,17 +40,17 @@ class TestLRU(unittest.TestCase):
self.lru[4] = 'asdf'
self.lru[5] = 'asdf'
self.assertEquals(self.lru[1], 'asdf')
self.assertEquals(self.lru[2], 'asdf')
self.assertEquals(self.lru[4], 'asdf')
self.assertEquals(self.lru[5], 'asdf')
self.assertEqual(self.lru[1], 'asdf')
self.assertEqual(self.lru[2], 'asdf')
self.assertEqual(self.lru[4], 'asdf')
self.assertEqual(self.lru[5], 'asdf')
# 3 should be evicted now
self.lru[6] = 'asdf'
self.assertRaises(KeyError, self.lru.__getitem__, 3)
self.assertEquals(self.lru[1], 'asdf')
self.assertEquals(self.lru[2], 'asdf')
self.assertEquals(self.lru[4], 'asdf')
self.assertEquals(self.lru[5], 'asdf')
self.assertEquals(self.lru[6], 'asdf')
self.assertEqual(self.lru[1], 'asdf')
self.assertEqual(self.lru[2], 'asdf')
self.assertEqual(self.lru[4], 'asdf')
self.assertEqual(self.lru[5], 'asdf')
self.assertEqual(self.lru[6], 'asdf')