You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/14 20:59:13 UTC

[1/3] git commit: [#3905] Limit tools expected in testing to a bare minimum

Updated Branches:
  refs/heads/master bf43535c8 -> 58591155e


[#3905] Limit tools expected in testing to a bare minimum

Signed-off-by: Peter Hartmann <pe...@apache.org>


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

Branch: refs/heads/master
Commit: 58591155ee73e5c439ee6e84425c49486266f340
Parents: a83595a
Author: Peter Hartmann <pe...@apache.org>
Authored: Wed May 1 20:29:37 2013 +0200
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 18:58:54 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_admin.py |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/58591155/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 3197386..e23d49c 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -180,11 +180,9 @@ class TestProjectAdmin(TestController):
         new_ep_opts = r.html.findAll('a',{'class':"install_trig"})
         tool_strings = [ ' '.join(opt.find('span').string.strip().split()) for opt in new_ep_opts ]
         expected_tools = [
-            'External Link',
             'Wiki',
             'Tickets',
             'Discussion',
-            'Chat (alpha)',
             'Blog',
             'Subproject']
         # check using sets, because their may be more tools installed by default


[3/3] git commit: [#3905] Remove unused helper along with unportable test

Posted by br...@apache.org.
[#3905] Remove unused helper along with unportable test

Signed-off-by: Peter Hartmann <pe...@apache.org>


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

Branch: refs/heads/master
Commit: 5983da705ba5406372846f911e9012451068424b
Parents: bf43535
Author: Peter Hartmann <pe...@apache.org>
Authored: Wed Apr 24 21:06:07 2013 +0200
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 18:58:54 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/helpers.py        |    7 -------
 Allura/allura/tests/test_helpers.py |    3 ---
 2 files changed, 0 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5983da70/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index c7b8fc6..5ac7abb 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -155,13 +155,6 @@ def find_project(url_path):
         length -= 1
     return None, url_path.split('/')
 
-def find_executable(exe_name):
-    '''Find the abspath of a given executable (which
-    must be on the PATH)'''
-    for dirname in os.environ['PATH'].split(os.pathsep):
-        path = os.path.join(dirname, exe_name)
-        if os.access(path, os.X_OK): return path
-
 def make_neighborhoods(ids):
     return _make_xs('Neighborhood', ids)
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5983da70/Allura/allura/tests/test_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 6eb1719..3ed21f4 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -90,9 +90,6 @@ def test_find_project():
     proj, rest = h.find_project('/p/testable/foo')
     assert proj is None
 
-def test_find_executable():
-    assert h.find_executable('bash') == '/bin/bash'
-
 def test_make_users():
     r = h.make_users([None]).next()
     assert r.username == '*anonymous', r


[2/3] git commit: [#3905] Fix UnicodeEncodeError when system locale is not english

Posted by br...@apache.org.
[#3905] Fix UnicodeEncodeError when system locale is not english

Signed-off-by: Peter Hartmann <pe...@apache.org>


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

Branch: refs/heads/master
Commit: a83595a66776ebc33210da8f075b3f24d1bd5675
Parents: 5983da7
Author: Peter Hartmann <pe...@apache.org>
Authored: Tue Apr 30 01:08:51 2013 +0200
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 18:58:54 2013 +0000

----------------------------------------------------------------------
 Allura/allura/config/middleware.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a83595a6/Allura/allura/config/middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index 5bcb32b..bd73dce 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -33,6 +33,7 @@ from pylons.middleware import StatusCodeRedirect
 
 import activitystream
 import ew
+import formencode
 import ming
 from ming.orm.middleware import MingMiddleware
 
@@ -99,6 +100,9 @@ def _make_core_app(root, global_conf, full_stack=True, **app_conf):
 
     # Configure EW variable provider
     ew.render.TemplateEngine.register_variable_provider(get_tg_vars)
+    
+    # Set FormEncode language to english, as we don't support any other locales
+    formencode.api.set_stdtranslation(domain='FormEncode', languages=['en'])
 
     # Create base app
     base_config = ForgeConfig(root)