Merge branch 'master' of github.com:okfn/ckanext-harvest

README.rst

@@ -36,9 +36,7 @@ Run the following command to create the necessary tables in the database::
     paster --plugin=ckanext-harvest harvester initdb --config=mysite.ini
 
 The extension needs a user with sysadmin privileges to perform the
-harvesting jobs. You can create such a user running these two commands::
-
-    paster --plugin=ckan user add harvest
+harvesting jobs. You can create such a user running this command::
 
     paster --plugin=ckan sysadmin add harvest
 

ckanext/harvest/model/__init__.py

@@ -3,12 +3,15 @@ import datetime
 
 from sqlalchemy import event
 from sqlalchemy import distinct
+from sqlalchemy import Table
+from sqlalchemy import Column
+from sqlalchemy import ForeignKey
+from sqlalchemy import types
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.orm import backref, relation
 
 from ckan import model
-from ckan.model.meta import (metadata,  mapper, Session,
-                            Table, Column, ForeignKey, types)
+from ckan.model.meta import metadata,  mapper, Session
 from ckan.model.types import make_uuid
 from ckan.model.domain_object import DomainObject
 from ckan.model.package import Package