You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/11/20 06:30:29 UTC

git commit: [#6850] Handle simplify of str import_id

Updated Branches:
  refs/heads/tv/6850 8d27c3f8a -> 70f7175bf


[#6850] Handle simplify of str import_id

- If the import_id is a str instead of a dict, we should go
  ahead and return that string, not None, for indexing.

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/70f7175b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/70f7175b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/70f7175b

Branch: refs/heads/tv/6850
Commit: 70f7175bfa5b59fc41cdc67d35eaa978c7906136
Parents: 8d27c3f
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Nov 20 05:30:10 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 20 05:30:10 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/70f7175b/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index c403590..0321d55 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1021,7 +1021,7 @@ class ImportIdConverter(object):
     def simplify(self, import_id):
         if hasattr(import_id, 'get'):
             return import_id.get('source_id')
-        return None
+        return import_id
 
     def expand(self, source_id, app_instance):
         import_id = {