update dependencies

Allen Short · Allen Short · commit 92d7db37c7cb · 2016-01-04T12:07:02.000-06:00
diff --git a/lib/crypto/packaged.py b/lib/crypto/packaged.py
@@ -91,7 +91,7 @@ def _sign_app(src, dest, ids, reviewer, tempname, local=False):
 
     pkcs7 = b64decode(json.loads(response.content)['zigbert.rsa'])
     try:
-        jar.make_signed(pkcs7)
+        jar.make_signed(pkcs7, sigpath='zigbert')
     except:
         log.error('App signing failed', exc_info=True)
         raise SigningError('App signing failed')
diff --git a/mkt/api/models.py b/mkt/api/models.py
@@ -33,7 +33,7 @@ def create_for_user(cls, user):
         return Access.objects.create(
             key=key,
             user=user,
-            secret=get_random_string())
+            secret=get_random_string().encode('ascii'))
 
 
 class Token(ModelBase):
diff --git a/mkt/purchase/models.py b/mkt/purchase/models.py
@@ -6,14 +6,14 @@
 
 
 from babel import Locale, numbers
-from mkt.site.utils import env
 from jingo.helpers import urlparams
 from jinja2.filters import do_dictsort
 
 import mkt
 from mkt.site.helpers import absolutify
 from mkt.site.mail import send_mail
 from mkt.site.models import ModelBase
+from mkt.site.utils import env
 from mkt.translations.utils import get_locale_from_lang
 
 
diff --git a/mkt/reviewers/helpers.py b/mkt/reviewers/helpers.py
@@ -11,6 +11,7 @@
 from jingo import register
 from django.utils.translation import pgettext, ugettext as _
 from django.utils.translation import ugettext_lazy as _lazy
+
 import mkt
 from mkt.access import acl
 from mkt.reviewers.models import EscalationQueue, QUEUE_TARAKO, ReviewerScore
diff --git a/mkt/search/utils.py b/mkt/search/utils.py
@@ -3,7 +3,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 
 from elasticsearch_dsl.search import Search as dslSearch
-from statsd import statsd
+from django_statsd.clients import statsd
 
 from mkt.constants.base import VALID_STATUSES
 
diff --git a/mkt/settings.py b/mkt/settings.py
@@ -871,7 +871,8 @@ def JINJA_CONFIG():
     config = {'extensions': ['jinja2.ext.do',
                              'jinja2.ext.with_',
                              'jinja2.ext.loopcontrols',
-                             'jinja2.ext.i18n'],
+                             'jinja2.ext.i18n',
+                             'waffle.jinja.WaffleExtension'],
               'autoescape': True,
               'finalize': lambda x: x if x is not None else ''}
     if False and not settings.DEBUG:
diff --git a/mkt/site/helpers.py b/mkt/site/helpers.py
@@ -199,7 +199,8 @@ def form_field(field, label=None, tag='div', req=None, opt=False, hint=False,
 @register.filter
 @jinja2.contextfilter
 def timelabel(context, time):
-    t = env.get_template('site/helpers/timelabel.html').render({'time': time})
+    t = env.get_template('site/helpers/timelabel.html').render(
+        {'time': time})
     return jinja2.Markup(t)
 
 
diff --git a/mkt/site/migrations/0002_auto_20151109_1326.py b/mkt/site/migrations/0002_auto_20151109_1326.py
@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('site', '0001_initial'),
+        ('waffle', '0001_initial'),
     ]
 
     operations = [
diff --git a/mkt/site/tests/__init__.py b/mkt/site/tests/__init__.py
@@ -26,8 +26,7 @@
 from nose.exc import SkipTest
 from nose.tools import eq_
 from pyquery import PyQuery as pq
-from waffle import cache_sample, cache_switch
-from waffle.models import Flag, Sample, Switch
+from waffle.models import Flag, Sample, Switch, cache_sample, cache_switch
 
 import mkt
 from lib.es.management.commands import reindex
diff --git a/mkt/site/tests/test_helpers.py b/mkt/site/tests/test_helpers.py
@@ -4,13 +4,14 @@
 import fudge
 import mock
 from datetime import datetime, timedelta
-from mkt.site.utils import env
+
 from nose.tools import eq_
 from urlparse import urljoin
 
 import mkt.site.tests
 from mkt.site.helpers import absolutify, css, js, product_as_dict, timesince
 from mkt.site.fixtures import fixture
+from mkt.site.utils import env
 from mkt.webapps.models import Webapp
 
 
diff --git a/mkt/site/utils.py b/mkt/site/utils.py
@@ -1,6 +1,7 @@
 import codecs
 import datetime
 import itertools
+import imp
 import operator
 import os
 import random
@@ -24,6 +25,7 @@
 from django.utils.encoding import smart_str, smart_unicode
 from django.utils.functional import Promise
 from django.utils.http import urlquote
+from django.utils.importlib import import_module
 
 import bleach
 import chardet
@@ -45,8 +47,33 @@
 from mkt.translations.models import Translation
 
 
+# Copied from jingo 0.7.1 -- loader in 0.8.1 is broken on python 2
+def load_helpers():
+    """Try to import ``helpers.py`` from each app in INSTALLED_APPS."""
+    # We want to wait as long as possible to load helpers so there aren't any
+    # weird circular imports with jingo.
+    if jingo._helpers_loaded:
+        return
+    jingo._helpers_loaded = True
+
+    from jingo import helpers  # noqa
+
+    for app in settings.INSTALLED_APPS:
+        try:
+            app_path = import_module(app).__path__
+        except AttributeError:
+            continue
+
+        try:
+            imp.find_module('helpers', app_path)
+        except ImportError:
+            continue
+
+        import_module('%s.helpers' % app)
+
+jingo.load_helpers = load_helpers
 # Install gettext functions into Jingo's Jinja2 environment.
-env = jingo.env
+env = jingo.get_env()
 env.install_gettext_translations(translation, newstyle=True)
 
 
diff --git a/mkt/submit/helpers.py b/mkt/submit/helpers.py
@@ -1,12 +1,13 @@
 import re
 
 import jinja2
-from jingo import register, env
+from jingo import register
 from langid import classify
 
 from django.conf import settings
 
 import mkt
+from mkt.site.utils import env
 from mkt.submit.models import AppSubmissionChecklist
 from mkt.translations.utils import find_language
 
diff --git a/mkt/translations/helpers.py b/mkt/translations/helpers.py
@@ -6,6 +6,9 @@
 import jingo
 import jinja2
 
+from mkt.site.utils import env
+from mkt.translations.utils import do_truncate
+
 jingo.register.filter(to_language)
 
 
@@ -40,7 +43,7 @@ def truncate(s, length=255, killwords=True, end='...'):
         return ''
     if hasattr(s, '__truncate__'):
         return s.__truncate__(length, killwords, end)
-    return jinja2.filters.do_truncate(smart_unicode(s), length, killwords, end)
+    return do_truncate(smart_unicode(s), length, killwords, end)
 
 
 @jingo.register.inclusion_tag('translations/trans-menu.html')
@@ -66,5 +69,5 @@ def all_locales(addon, field_name, nl2br=False, prettify_empty=False):
                                            localized_string__isnull=False)
     ctx = dict(addon=addon, field=field, field_name=field_name,
                translations=trans, nl2br=nl2br, prettify_empty=prettify_empty)
-    t = jingo.env.get_template('translations/all-locales.html')
+    t = env.get_template('translations/all-locales.html')
     return jinja2.Markup(t.render(ctx))
diff --git a/mkt/translations/tests/test_helpers.py b/mkt/translations/tests/test_helpers.py
@@ -10,6 +10,7 @@
 from mkt.translations.fields import save_signal
 from mkt.translations.models import PurifiedTranslation
 from mkt.translations.tests.testapp.models import TranslatedModel
+from mkt.site.utils import env
 from mkt.webapps.models import Webapp
 
 
@@ -59,17 +60,17 @@ def test_empty_locale_html():
 def test_truncate_purified_field():
     s = '<i>one</i><i>two</i>'
     t = PurifiedTranslation(localized_string=s)
-    actual = jingo.env.from_string('{{ s|truncate(6) }}').render({'s': t})
+    actual = env.from_string('{{ s|truncate(6) }}').render({'s': t})
     eq_(actual, s)
 
 
 def test_truncate_purified_field_xss():
     """Truncating should not introduce xss issues."""
     s = 'safe <script>alert("omg")</script>'
     t = PurifiedTranslation(localized_string=s)
-    actual = jingo.env.from_string('{{ s|truncate(100) }}').render({'s': t})
+    actual = env.from_string('{{ s|truncate(100) }}').render({'s': t})
     eq_(actual, 'safe &lt;script&gt;alert("omg")&lt;/script&gt;')
-    actual = jingo.env.from_string('{{ s|truncate(5) }}').render({'s': t})
+    actual = env.from_string('{{ s|truncate(5) }}').render({'s': t})
     eq_(actual, 'safe ...')
 
 
diff --git a/mkt/translations/utils.py b/mkt/translations/utils.py
@@ -10,6 +10,25 @@
 from html5lib.serializer.htmlserializer import HTMLSerializer
 
 
+# Copypaste from Jinja2 2.7.2. The behaviour change in 2.8 may be more
+# desirable but this matches our existing tests.
+def do_truncate(s, length=255, killwords=False, end='...'):
+    if len(s) <= length:
+        return s
+    elif killwords:
+        return s[:length] + end
+    words = s.split(' ')
+    result = []
+    m = 0
+    for word in words:
+        m += len(word) + 1
+        if m > length:
+            break
+        result.append(word)
+    result.append(end)
+    return u' '.join(result)
+
+
 def truncate_text(text, limit, killwords=False, end='...'):
     """Return as many characters as possible without going over the limit.
 
@@ -24,7 +43,7 @@ def truncate_text(text, limit, killwords=False, end='...'):
 
     # Explicitly add "end" in any case, as Jinja can't know we're truncating
     # for real here, even though we might be at the end of a word.
-    text = jinja2.filters.do_truncate(text, limit, killwords, end='')
+    text = do_truncate(text, limit, killwords, end='')
     return text + end, 0
 
 
diff --git a/mkt/users/tests/test_views.py b/mkt/users/tests/test_views.py
@@ -7,7 +7,6 @@
 from jingo.helpers import urlparams
 from nose.tools import eq_, ok_
 from pyquery import PyQuery as pq
-from waffle import helpers  # NOQA
 
 from mkt.site.fixtures import fixture
 from mkt.site.tests import TestCase
diff --git a/requirements/compiled.txt b/requirements/compiled.txt
@@ -1,11 +1,11 @@
 # These should all be in our wheelhouse to avoid compiling on production and
 # automated testing machines
 # cffi is required by cryptography
-cffi==0.9.2
+cffi==1.4.2
 # cryptography is required by pyOpenSSL
-cryptography==0.8.2
-Jinja2==2.7.2
-lxml==3.4.3
+cryptography==1.1.2
+Jinja2==2.8
+lxml==3.5.0
 MarkupSafe==0.23
 # M2Crypto is required by m2secret, mozpay, PyBrowserID, PyJWT-mozilla, django-aesfield
 M2Crypto==0.22.3
diff --git a/requirements/prod.txt b/requirements/prod.txt

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class Migration(migrations.Migration):`
`15`	`15`
`16`	`16`	`dependencies = [`
`17`	`17`	`('site', '0001_initial'),`
	`18`	`+ ('waffle', '0001_initial'),`
`18`	`19`	`]`
`19`	`20`
`20`	`21`	`operations = [`