Update dependency meta, Clean imports.

CHANGES.txt

@@ -6,7 +6,7 @@ CHANGES
 0.3.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Update dependency meta, Clean imports.
 
 
 0.3.0 (2010-06-28)

buildout.cfg

@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-parts = test coverage
+parts = test coverage checker
 
 [test]
 recipe = zc.recipe.testrunner
@@ -10,3 +10,7 @@ defaults = ['--tests-pattern', '^f?tests$']
 [coverage]
 recipe = zc.recipe.egg
 eggs = tha.coverage
+
+[checker]
+recipe = lovely.recipe:importchecker
+path = src/z3c/sampledata

setup.py

@@ -57,7 +57,6 @@ def read(*rnames):
     extras_require = dict(
         test = [
             'zope.app.testing',
-            'zope.app.security',
             'zope.app.zcmlfiles',
             ],
         ),
@@ -68,11 +67,15 @@ def read(*rnames):
         'zope.i18nmessageid',
         'zope.interface',
         'zope.intid',
+        'zope.lifecycleevent',
         'zope.schema',
         'zope.site',
+        'zope.traversing',
         'zope.viewlet',
         'zope.app.pagetemplate>=3.6.0',
         'zope.app.authentication>=3.7.0',
+        'zope.app.component',
+        'zope.app.security',
         ],
     zip_safe = False,
 )

src/z3c/sampledata/browser/views.py

@@ -1,9 +1,10 @@
 from z3c.sampledata import _
-from z3c.sampledata.interfaces import ISampleDataPlugin, ISampleManager
+from z3c.sampledata.interfaces import ISampleManager
 from zope import component
 from zope import interface
 from zope import schema
 from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.traversing.browser import absoluteURL
 import zope.formlib.form
 import zope.app.pagetemplate.namedtemplate
 import zope.formlib.interfaces
@@ -25,7 +26,7 @@ def update(self):
         if 'manager' in self.request:
             managerName = self.request['manager']
             self.request.response.redirect(
-                zapi.absoluteURL(self.context, self.request)+
+                absoluteURL(self.context, self.request)+
                 '/@@generatesample.html?manager="%s"'%(managerName))
 
 
@@ -108,4 +109,3 @@ def __init__(self, context, request, plugin=None, schema=None, prefix=''):
         self.schema = schema
         self.prefix = prefix
         super(Generator, self).__init__(context, request)
-

src/z3c/sampledata/generator/intids.py

@@ -17,16 +17,12 @@
 """
 __docformat__ = "reStructuredText"
 
-import zope.component
 import zope.event
-import zope.interface
 import zope.lifecycleevent
-import zope.schema
 from zope.interface import implements
 from zope.intid import IntIds
 from zope.intid.interfaces import IIntIds
 
-from z3c.sampledata import _
 from z3c.sampledata.interfaces import ISampleDataPlugin
 
 class SampleIntIds(object):
@@ -54,4 +50,3 @@ def generate(self, context, param={}, dataSource={}, seed=None):
             return intid
         else:
             return default['intid']
-

src/z3c/sampledata/generator/pau.py

@@ -17,10 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-import zope.interface
-import zope.component
 import zope.event
-import zope.schema
 import zope.lifecycleevent
 from zope.interface import implements
 
@@ -31,8 +28,6 @@
 
 from z3c.sampledata.interfaces import ISampleDataPlugin
 
-from z3c.sampledata import _
-
 
 class SamplePau(object):
 
@@ -69,4 +64,3 @@ def generate(self, context, param={}, dataSource={}, seed=None):
             return pau
         else:
             return default['pau']
-

src/z3c/sampledata/generator/principals.py

@@ -23,8 +23,6 @@
 import zope.schema
 import zope.lifecycleevent
 from zope.interface import implements
-from zope.security.proxy import removeSecurityProxy
-from zope.app.security.interfaces import IAuthentication
 from zope.app.authentication import principalfolder
 from zope.app.component import hooks
 
@@ -85,7 +83,7 @@ class ISamplePrincipalParameters(zope.interface.Interface):
 
 class SamplePrincipals(object):
     """Create principals inside a site manager.
-    
+
     context : site
     return  : pau in which the principals where created
     """
@@ -163,4 +161,3 @@ def _createPrincipal(self, site, info):
 
     def _createDummyPrincipalInfo(self, site, i):
         return ['login%i'%i, 'name%i'%i, '%i'%i]
-

src/z3c/sampledata/generator/site.py

@@ -17,7 +17,6 @@
 """
 __docformat__ = "reStructuredText"
 
-import zope.component
 import zope.event
 import zope.interface
 import zope.lifecycleevent

src/z3c/sampledata/layer.py

@@ -26,7 +26,6 @@
 """
 __docformat__ = "reStructuredText"
 
-import unittest
 import os
 import transaction
 
@@ -44,7 +43,7 @@
 
 class BufferedDatabaseTestLayer(object):
     """A test layer which creates a sample database.
-    
+
     The created database is later used without the need to run through the
     sample generation again.
     This speeds up functional tests.
@@ -115,4 +114,3 @@ def _createParam(self, manager):
                 for name, field in schema.getFieldsInOrder(iface):
                     data[name] = field.default or field.missing_value
         return ret
-

src/z3c/sampledata/metaconfigure.py

@@ -1,4 +1,3 @@
-from zope import component
 from zope.component.zcml import utility
 
 from manager import Manager
@@ -33,4 +32,3 @@ def datasource(self, _context, name, adapterInterface, adapterName=u''):
 
     def __call__(self):
         return
-