Milimetric has submitted this change and it was merged.
Change subject: Use os.path.join instead of string concatenation to create
paths. This is required to make the user_metrics puppet module work
......................................................................
Use os.path.join instead of string concatenation to create paths.
This is required to make the user_metrics puppet module work
Change-Id: I88c03886896cf48fe13b06233a74e26d43fe56ff
---
M user_metrics/api/engine/data.py
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/user_metrics/api/engine/data.py b/user_metrics/api/engine/data.py
index 301847b..6b452b1 100644
--- a/user_metrics/api/engine/data.py
+++ b/user_metrics/api/engine/data.py
@@ -53,6 +53,7 @@
from collections import OrderedDict
from hashlib import sha1
import cPickle
+import os
import user_metrics.etl.data_loader as dl
from user_metrics.config import logging
@@ -254,17 +255,17 @@
def read_pickle_data():
try:
- with open(settings.__data_file_dir__ +
- 'api_data.pkl', 'rb') as pkl_file:
+ with open(os.path.join(settings.__data_file_dir__,
+ 'api_data.pkl'), 'rb') as pkl_file:
return cPickle.load(pkl_file)
except IOError:
- with open(settings.__data_file_dir__ +
- 'api_data.pkl', 'wb') as pkl_file:
+ with open(os.path.join(settings.__data_file_dir__,
+ 'api_data.pkl'), 'wb') as pkl_file:
data = OrderedDict()
cPickle.dump(data, pkl_file)
return data
def write_pickle_data(obj):
- with open(settings.__data_file_dir__ +
- 'api_data.pkl', 'wb') as pkl_file:
+ with open(os.path.join(settings.__data_file_dir__,
+ 'api_data.pkl'), 'wb') as pkl_file:
cPickle.dump(obj, pkl_file)
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/60966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88c03886896cf48fe13b06233a74e26d43fe56ff
Gerrit-PatchSet: 1
Gerrit-Project: analytics/E3Analysis
Gerrit-Branch: master
Gerrit-Owner: Diederik <[email protected]>
Gerrit-Reviewer: Erosen <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
