Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62858
Change subject: adding test files and fixing bugs: encoding and exception
handling
......................................................................
adding test files and fixing bugs: encoding and exception handling
Change-Id: I1297d207a7684b02c62b015d9789a0a391de2cc8
---
M user_metrics/api/views.py
A user_metrics/test/umapi_sample1.csv
A user_metrics/test/umapi_sample2.txt
3 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/58/62858/1
diff --git a/user_metrics/api/views.py b/user_metrics/api/views.py
index 7a9edb0..a656f06 100644
--- a/user_metrics/api/views.py
+++ b/user_metrics/api/views.py
@@ -194,7 +194,7 @@
wiki_projects=sorted(conf.PROJECT_DB_MAP.keys())
)
except Exception, e:
- logging.exception()
+ logging.exception(str(e))
flash('The file you uploaded was not in a valid format, could not
be validated, or the project you specified is not configured on this instance
of User Metrics API.')
return redirect('/uploads/cohort')
@@ -204,7 +204,7 @@
return json.dumps(available)
def parse_records(records, default_project):
- return [{'username': r[0], 'project': r[1] if len(r) > 1 else
default_project} for r in records]
+ return [{'username': r[0], 'project': r[1] if len(r) > 1 else
default_project} for r in records if r]
def normalize_project(project):
project = project.strip().lower()
@@ -281,6 +281,8 @@
project = request.form.get('cohort_project')
users_json = request.form.get('users')
users = json.loads(users_json)
+ for user in users:
+ user['username'] = user['username'].encode('utf8')
# re-validate
available = query_mod.is_valid_cohort_query(cohort_name)
if not available:
@@ -298,11 +300,11 @@
query_mod.add_cohort_users(cohort_name, valid)
flash('Upload successful, your cohort is in the list below.')
return url_for('cohort', cohort=cohort_name)
- #return url_for('all_cohorts')
+
except Exception, e:
- logging.exception()
+ logging.exception(str(e))
flash('There was a problem finishing the upload. The cohort was not
saved.')
- return redirect('/uploads/cohort')
+ return '/uploads/cohort'
def metric(metric=''):
diff --git a/user_metrics/test/umapi_sample1.csv
b/user_metrics/test/umapi_sample1.csv
new file mode 100644
index 0000000..59c5cdc
--- /dev/null
+++ b/user_metrics/test/umapi_sample1.csv
@@ -0,0 +1,3 @@
+DarTar,
+
+
diff --git a/user_metrics/test/umapi_sample2.txt
b/user_metrics/test/umapi_sample2.txt
new file mode 100644
index 0000000..a24963c
--- /dev/null
+++ b/user_metrics/test/umapi_sample2.txt
@@ -0,0 +1,2 @@
+DarTar
+ליאור
--
To view, visit https://gerrit.wikimedia.org/r/62858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1297d207a7684b02c62b015d9789a0a391de2cc8
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
