Introduce dynamic scope_path regexps Instead of relying on scope_path's being "one slash deep", we should instead allow for either: 1. scope_paths that have a pre-defined depth 2. scope_paths that can be arbitrarily deep We achieve 1 by setting an entities scope_logic to another logic module. We then recursively call getScopeDepth until we get to the topmost entity (that is, an unscoped entity). A little different is the solution to 2, since some entities can have an arbitrarily deep scope (such as Documents), we need to have some way of signaling this to getScopePattern. A clean solution is to return None, rather than a number. If None is returned, the SCOPE_PATH_ARG_PATTERN is returned as regexp instead, which will match an arbitrarily deeply nested scope. The solution for 2 requires that we return None somewhere in the scope_logic chain, the most straight forward method to do so is to override getScopeDepth anywhere such a scope is needed and make it return None. A more elegant solution however, is to set the scope_logic to that module in all entities that require it. Patch by: Sverre Rabbelier

     1

VERSION = (1, 1, 0, 'alpha', 0)

     2

     3

def get_version():

     4

    version = '%s.%s' % (VERSION[0], VERSION[1])

     5

    if VERSION[2]:

     6

        version = '%s.%s' % (version, VERSION[2])

     7

    if VERSION[3:] == ('alpha', 0):

     8

        version = '%s pre-alpha' % version

     9

    else:

    10

        version = '%s %s' % (version, VERSION[3])

    11

        if VERSION[3] != 'final':

    12

            version = '%s %s' % (version, VERSION[4])

    13

    from django.utils.version import get_svn_revision

    14

    svn_rev = get_svn_revision()

    15

    if svn_rev != u'SVN-unknown':

    16

        version = "%s %s" % (version, svn_rev)

    17

    return version