1
=== modified file 'buildout.cfg'
2
--- buildout.cfg	2009-11-23 04:09:44 +0000
3
+++ buildout.cfg	2009-12-16 03:50:30 +0000
4
@@ -64,6 +64,10 @@
5
64
                 'ignore',
64
                 'ignore',
6
65
                 'Module .+ was already imported from .+, but .+ is being added.*',
65
                 'Module .+ was already imported from .+, but .+ is being added.*',
7
66
                 UserWarning)
66
                 UserWarning)
8
67
		 # XXX: BradCrittenden 2009-12-14 bug=496705: A single, well-known entry point
9
68
		 # for initialization work needs to be created.
10
69
                 from lp.services.mime import customizeMimetypes
11
70
                 customizeMimetypes()
12
67
entry-points = stxdocs=zope.configuration.stxdocs:main
71
entry-points = stxdocs=zope.configuration.stxdocs:main
13
68
    googletestservice=canonical.launchpad.testing.googletestservice:main
72
    googletestservice=canonical.launchpad.testing.googletestservice:main
14
69
    windmill=windmill.bin.windmill_bin:main
73
    windmill=windmill.bin.windmill_bin:main
15
70
74
16
=== modified file 'lib/lp/services/tests/test_mime.py'
17
--- lib/lp/services/tests/test_mime.py	2009-12-10 23:01:23 +0000
18
+++ lib/lp/services/tests/test_mime.py	2009-12-16 03:50:30 +0000
19
@@ -9,6 +9,13 @@
20
9
9
21
10
import mimetypes
10
import mimetypes
22
11
from lp.testing import TestCase
11
from lp.testing import TestCase
23
12
from lp.services.mime import customizeMimetypes
24
13
25
14
26
15
# In our run-time environment this call is made via the initialization section
27
16
# of buildout.cfg but that initialization is not done for tests so it must be
28
17
# done manually here.
29
18
customizeMimetypes()
30
12
19
31
13
20
32
14
class TestBzip(TestCase):
21
class TestBzip(TestCase):
33
@@ -36,6 +43,5 @@
34
36
        self.assertEqual('bzip2', encoding)
43
        self.assertEqual('bzip2', encoding)
35
37
44
36
38
45
37
39
38
40
def test_suite():
46
def test_suite():
39
41
    return unittest.TestLoader().loadTestsFromName(__name__)
47
    return unittest.TestLoader().loadTestsFromName(__name__)
40
42
48
41
=== modified file 'lib/site.py'
42
--- lib/site.py	2009-12-09 11:47:58 +0000
43
+++ lib/site.py	2009-12-16 03:50:30 +0000
44
@@ -28,7 +28,3 @@
45
28
import sys
28
import sys
46
29
execfile(
29
execfile(
47
30
    os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site.py'))
30
    os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site.py'))
48
31
49
32
# Perform other start-up initialization.
50
33
from lp.services.mime import customizeMimetypes
51
34
customizeMimetypes()
Reviewer	Review Type	Date Requested	Status
Данило Шеган (community)	release-critical	2009-12-14	Approve on 2009-12-15
Curtis Hovey (community)	code	2009-12-14	Approve on 2009-12-14
Review via email: mp+16170@code.launchpad.net