Added a merge_params and check_access decorator The merge_params decorator is very simple and takes self._params and merges it with params. It's main purpose is to explicitly mark the views in which it is intended that self._params is merged raw. The check_access decorator factors out the access checking process and passes args and kwargs to the access checking methods. Patch by: Sverre Rabbelier

     1

from query import *

     2

from subqueries import *

     3

from where import AND, OR

     4

from datastructures import EmptyResultSet

     5

     6

__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet']

     7