Merge pull request #669 from willkg/1202288-round5

1202288 round5
mozilla · Sep 9, 2015 · 5e57c84 · 5e57c84
2 parents b4b040c + 8695111
commit 5e57c84
Show file tree

Hide file tree

Showing 218 changed files with 13,255 additions and 84,260 deletions.
diff --git a/fjord/base/utils.py b/fjord/base/utils.py
@@ -20,7 +20,7 @@
 from product_details import product_details
 from ratelimit.helpers import is_ratelimited
 from rest_framework.throttling import BaseThrottle
-from statsd import statsd
+from statsd.defaults.django import statsd
 
 from fjord.base.urlresolvers import reverse
 

diff --git a/fjord/feedback/models.py b/fjord/feedback/models.py
@@ -6,7 +6,7 @@
 import elasticsearch_dsl as es_dsl
 from product_details import product_details
 from rest_framework import serializers
-from statsd import statsd
+from statsd.defaults.django import statsd
 
 from fjord.base.browsers import parse_ua
 from fjord.base.data import register_purger

diff --git a/fjord/feedback/views.py b/fjord/feedback/views.py
@@ -9,7 +9,7 @@
 from django.views.decorators.http import require_POST
 
 from mobility.decorators import mobile_template
-from statsd import statsd
+from statsd.defaults.django import statsd
 import waffle
 
 from fjord.base.browsers import UNKNOWN

diff --git a/fjord/heartbeat/api_views.py b/fjord/heartbeat/api_views.py
@@ -2,7 +2,7 @@
 
 import rest_framework.views
 import rest_framework.response
-from statsd import statsd
+from statsd.defaults.django import statsd
 
 from .models import Answer, AnswerSerializer
 from fjord.base.utils import cors_enabled

diff --git a/fjord/search/utils.py b/fjord/search/utils.py
@@ -1,7 +1,7 @@
 from functools import wraps
 
 from elasticsearch import ElasticsearchException
-from statsd import statsd
+from statsd.defaults.django import statsd
 
 
 def es_error_statsd(fun):

diff --git a/fjord/translations/models.py b/fjord/translations/models.py
@@ -7,7 +7,7 @@
 from django.db import models
 
 from dennis.translator import Translator
-from statsd import statsd
+from statsd.defaults.django import statsd
 import waffle
 
 from .gengo_utils import (

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -108,8 +108,8 @@ django-pipeline==1.5.4
 # sha256: -thF7ifqqSii7RbAEh4rtd0TzN6V0cAUTSP5pCUMGmw
 django-ratelimit==0.4.0
 
-# sha256: 1_LzcE9lU8uG-6xLw0Z9LJp_xEkYgYxyNckQAK8rqYU
-django-statsd-mozilla==0.3.8.5
+# sha256: wOkPMEu_bxD2PgAZECmAyVDcaDMm0qTlDnGZ3sxDw2o
+django-statsd-mozilla==0.3.15
 
 # sha256: YPJ9jdB0c4sT7ZJqy7C9UbTnFn05Q6BFZkVxGuIrGrQ
 djangorestframework==3.1.3
@@ -132,8 +132,8 @@ gengo==0.1.19
 # sha256: A3VLx7JWOXwbZG5QSOIpFZD1CAFxrbiwD04tc4THbu4
 GitPython==0.1.7
 
-# sha256: pucH2csXyL8eVTcTrRSzEnSoHVwM4PziGwKTbQ79fbs
-html5lib==0.95
+# sha256: 43K2b0mX-OHelw6nVdClKNciLSqpvVWqwHjH7zm49sM
+html5lib==0.999999
 
 # sha256: fLtRSjUvghxpuOi9qmsuWXKFR6iWVQPHWGUsKCbRV7U
 importlib==1.0.3
@@ -174,8 +174,8 @@ requests-mock==0.6.0
 # sha256: 4kBSQR_E-9H2cmNVN8P8IzDZSBsYwDF2lbRiWVEskdU
 six==1.9.0
 
-# sha256: HhLNQXx94_wcl9EUouRNXDA8OuXMnS_YihiktArLd5o
-statsd==2.0.3
+# sha256: -65f6zOuk5TCdbyDSrlGhLlN4DrMjzY4e9C_DFHvKO4
+statsd==3.1
 
 # sha256: fBfxgT4FanY_8qG5AI3R29jfjI4Z17TfZmgOMXzLPr8
 tldextract==1.7.1

diff --git a/vendor/packages/html5lib/MANIFEST.in b/vendor/packages/html5lib/MANIFEST.in
diff --git a/vendor/packages/html5lib/PKG-INFO b/vendor/packages/html5lib/PKG-INFO
diff --git a/vendor/packages/html5lib/README b/vendor/packages/html5lib/README
diff --git a/vendor/packages/html5lib/html5lib.egg-info/PKG-INFO b/vendor/packages/html5lib/html5lib.egg-info/PKG-INFO
diff --git a/vendor/packages/html5lib/html5lib.egg-info/SOURCES.txt b/vendor/packages/html5lib/html5lib.egg-info/SOURCES.txt
diff --git a/vendor/packages/html5lib/html5lib.egg-info/dependency_links.txt b/vendor/packages/html5lib/html5lib.egg-info/dependency_links.txt
diff --git a/vendor/packages/html5lib/html5lib.egg-info/top_level.txt b/vendor/packages/html5lib/html5lib.egg-info/top_level.txt
diff --git a/vendor/packages/html5lib/html5lib/__init__.py b/vendor/packages/html5lib/html5lib/__init__.py