From f544ddcefd998a90f731e570cf3e20186d2c3d74 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Tue, 8 Jan 2013 03:46:10 +0100 Subject: [PATCH 1/2] removed python2.7-specific dict comprehension (see PEP 274) --- apps/bootstrap/utils.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/bootstrap/utils.py b/apps/bootstrap/utils.py index e68af0fb6f..fe331dcbc7 100644 --- a/apps/bootstrap/utils.py +++ b/apps/bootstrap/utils.py @@ -27,14 +27,16 @@ items in the preceeding sets. # Find all items that don't depend on anything. extra_items_in_deps = reduce(set.union, data.itervalues()) - set(data.iterkeys()) # Add empty dependences where needed - data.update({item:set() for item in extra_items_in_deps}) + for item in extra_items_in_deps: + data[item] = set() while True: ordered = set(item for item, dep in data.iteritems() if not dep) if not ordered: break yield ordered - data = {item: (dep - ordered) - for item, dep in data.iteritems() - if item not in ordered} + data = {} + for item, dep in data.iteritems(): + if item not in ordered: + data[item] = dep - ordered assert not data, "Cyclic dependencies exist among these items:\n%s" % '\n'.join(repr(x) for x in data.iteritems()) ## end of http://code.activestate.com/recipes/578272/ }}} From e6f7a1a6517e31f42f66b16ffc869a9413ccada3 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Tue, 8 Jan 2013 04:03:50 +0100 Subject: [PATCH 2/2] fixed typo in introduction --- docs/intro/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/intro/installation.rst b/docs/intro/installation.rst index 90277eb902..7cb7bd3f89 100644 --- a/docs/intro/installation.rst +++ b/docs/intro/installation.rst @@ -129,7 +129,7 @@ To test your installation, create a file called settings_local.py with the follo Execute Django’s development server using the ``runserver`` command to launch a local instance of Mayan EDMS:: - $ ./manager.py runserver + $ ./manage.py runserver Point your browser to http://127:0.0.1:8000, if everything was installed correctly you should see the login screen. After making sure everything