jenkins-bot has submitted this change and it was merged.

Change subject: Create path using os.join.path instead of ''.join
......................................................................


Create path using os.join.path instead of ''.join

Change-Id: Idac914bc58d18e9db55b880a4edf50085c799d5c
---
M puppet/modules/user_metrics/templates/settings.py.erb
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/user_metrics/templates/settings.py.erb 
b/puppet/modules/user_metrics/templates/settings.py.erb
index 3019c21..b66bd1a 100644
--- a/puppet/modules/user_metrics/templates/settings.py.erb
+++ b/puppet/modules/user_metrics/templates/settings.py.erb
@@ -4,6 +4,7 @@
 from os.path import exists
 from urllib2 import urlopen
 import json
+import os
 
 # Get working set of Python modules
 working_set = WorkingSet()
@@ -16,8 +17,8 @@
 __instance_port__ = 5000
 
 __project_home__            = '<%= user_metrics_path %>'
-__web_home__                = ''.join([__project_home__, 'user_metrics/api/'])
-__data_file_dir__           = ''.join([__project_home__, 'data/'])
+__web_home__                = os.path.join(__project_home__, 
'user_metrics/api/')
+__data_file_dir__           = os.path.join(__project_home__, 'data/')
 
 __query_module__            = 'user_metrics.query.query_calls_sql'
 __user_thread_max__         = 50

-- 
To view, visit https://gerrit.wikimedia.org/r/61340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idac914bc58d18e9db55b880a4edf50085c799d5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Diederik <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to