lazr.restful

Merge lp:~cjwatson/lazr.restful/remove-compat-imports into lp:lazr.restful

  1. remove-compat-imports
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 230
Proposed branch: lp:~cjwatson/lazr.restful/remove-compat-imports
Merge into: lp:lazr.restful
Prerequisite: lp:~cjwatson/lazr.restful/tox
Diff against target: 72 lines (+7/-4)
4 files modified
NEWS.rst (+3/-0)
setup.py (+1/-1)
src/lazr/restful/_resource.py (+2/-2)
src/lazr/restful/testing/tales.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/lazr.restful/remove-compat-imports
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
LAZR Developers Pending
Review via email: mp+375438@code.launchpad.net

Commit message

Remove dependency on zope.app.pagetemplate.

Description of the change

Also explicitly depend on zope.datetime, which was previously only pulled in indirectly.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.rst'
2--- NEWS.rst 2019-11-12 14:31:12 +0000
3+++ NEWS.rst 2019-11-12 14:31:12 +0000
4@@ -35,6 +35,9 @@
5
6 Switch from buildout to tox.
7
8+Remove dependency on zope.app.pagetemplate. Explicitly depend on
9+zope.datetime, which was previously only pulled in indirectly.
10+
11 0.20.1 (2018-02-21)
12 ===================
13
14
15=== modified file 'setup.py'
16--- setup.py 2019-11-12 14:31:12 +0000
17+++ setup.py 2019-11-12 14:31:12 +0000
18@@ -65,9 +65,9 @@
19 'testtools',
20 'van.testing',
21 'wsgiref',
22- 'zope.app.pagetemplate',
23 'zope.component [zcml]',
24 'zope.configuration',
25+ 'zope.datetime',
26 'zope.event',
27 'zope.interface>=3.8.0',
28 'zope.pagetemplate',
29
30=== modified file 'src/lazr/restful/_resource.py'
31--- src/lazr/restful/_resource.py 2019-11-04 17:35:37 +0000
32+++ src/lazr/restful/_resource.py 2019-11-12 14:31:12 +0000
33@@ -46,7 +46,6 @@
34 import sha
35 sha_constructor = sha.new
36
37-from zope.app.pagetemplate.engine import TrustedAppPT
38 from zope.component import (
39 adapter,
40 getAdapters,
41@@ -58,7 +57,6 @@
42 queryMultiAdapter,
43 )
44 from zope.event import notify
45-from zope.publisher.http import init_status_codes, status_reasons
46 from zope.interface import (
47 alsoProvides,
48 implementer,
49@@ -72,8 +70,10 @@
50 IInterface,
51 )
52 from zope.location.interfaces import ILocation
53+from zope.pagetemplate.engine import TrustedAppPT
54 from zope.pagetemplate.pagetemplatefile import PageTemplateFile
55 from zope.proxy import isProxy
56+from zope.publisher.http import init_status_codes, status_reasons
57 from zope.publisher.interfaces import NotFound
58 from zope.publisher.interfaces.http import IHTTPRequest
59 from zope.schema import ValidationError, getFieldsInOrder
60
61=== modified file 'src/lazr/restful/testing/tales.py'
62--- src/lazr/restful/testing/tales.py 2009-03-26 17:25:22 +0000
63+++ src/lazr/restful/testing/tales.py 2019-11-12 14:31:12 +0000
64@@ -8,7 +8,7 @@
65 'test_tales',
66 ]
67
68-from zope.app.pagetemplate.engine import TrustedEngine
69+from zope.pagetemplate.engine import TrustedEngine
70
71
72 class Context:

Subscribers

People subscribed via source and target branches