Skip to content
This repository has been archived by the owner on May 9, 2018. It is now read-only.

Commit

Permalink
Move S3 configuration from .boto to app config.
Browse files Browse the repository at this point in the history
  • Loading branch information
spladug committed Jan 1, 2012
1 parent 52d8910 commit 6cc6533
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions postcards/lib/utils.py
@@ -1,17 +1,17 @@
import boto
import json
import Image
import base64
import urllib
import hashlib
import cStringIO
import subprocess
from boto.s3.connection import S3Connection

from postcards import app
from postcards.models import db, Postcard
from postcards.lib.queue import processed_asynchronously

s3 = boto.connect_s3()
s3 = S3Connection(app.config['S3_ACCESS_KEY'], app.config['S3_SECRET_KEY'])
bucket = s3.get_bucket(app.config['S3_BUCKET'])

def s3_url_from_filename(filename):
Expand Down
2 changes: 1 addition & 1 deletion runserver.py
@@ -1,4 +1,4 @@
#!/usr/bin/python

from postcards import app
app.run(debug=True)
app.run()

0 comments on commit 6cc6533

Please sign in to comment.