Merge remote-tracking branch 'brett/itsdangerous'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Tue, 9 Apr 2013 17:40:54 +0000 (19:40 +0200)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Tue, 9 Apr 2013 17:40:54 +0000 (19:40 +0200)
* brett/itsdangerous:
  Call is_updated instead of testing it boolean.
  Harden It's Dangerous key management.
  First tests for the Session class.
  Set a starting value for session.send_new_cookie.
  Remove beaker stuff from the code.
  Delete the session cookie on an empty session.
  Back sessions with It's Dangerous.
  Improve fs security for itsdangerous secret.
  Docs for get_timed_signer_url.
  Basic itsdangerous infrastructure.

Conflicts:
mediagoblin/tests/test_cache.py

1  2 
mediagoblin/tests/tools.py
setup.py

index f70257153e712998dbb7404d6132b6b4adad1019,1d8e6e9665830b845dbe6ae46b20a55ebf026938..a0498a6eb89806913ea554d7bb9cac8520ad563a
@@@ -43,16 -43,14 +43,14 @@@ TEST_APP_CONFIG = pkg_resources.resourc
      'mediagoblin.tests', 'test_mgoblin_app.ini')
  TEST_USER_DEV = pkg_resources.resource_filename(
      'mediagoblin.tests', 'test_user_dev')
 -MGOBLIN_APP = None
 +
  
- USER_DEV_DIRECTORIES_TO_SETUP = [
-     'media/public', 'media/queue',
-     'beaker/sessions/data', 'beaker/sessions/lock']
+ USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue']
  
  BAD_CELERY_MESSAGE = """\
 -Sorry, you *absolutely* must run nosetests with the
 +Sorry, you *absolutely* must run tests with the
  mediagoblin.init.celery.from_tests module.  Like so:
 -$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests ./bin/nosetests"""
 +$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests ./bin/py.test"""
  
  
  class BadCeleryEnviron(Exception): pass
diff --cc setup.py
index 4b983e3fb0d589c95580c4f5dea5f7d065a165fa,1aebeb0fa4548e938d78b51b2a0cb7f5e2139fb1..a98cd013b5c7e46ded48eb448b1967c85ffd7fb2
+++ b/setup.py
@@@ -43,11 -43,9 +43,10 @@@ setup
      install_requires=[
          'setuptools',
          'PasteScript',
-         'beaker',
          'wtforms',
          'py-bcrypt',
 -        'nose',
 +        'pytest',
 +        'pytest-xdist',
          'werkzeug>=0.7',
          'celery==2.5.3',
          'kombu==2.1.7',