From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 15 Aug 2013 15:34:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/tsyesika/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4834ef8ec21e985290f5e0015ae9452070956170;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/tsyesika/master'

New oauth tools!  Heck yeah!
---

4834ef8ec21e985290f5e0015ae9452070956170
diff --cc mediagoblin/db/models.py
index 7448f5ce,74dea44e..f0cbce2a
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@@ -580,26 -646,11 +646,26 @@@ with_polymorphic
      [ProcessingNotification, CommentNotification])
  
  MODELS = [
-     User, MediaEntry, Tag, MediaTag, MediaComment, Collection, CollectionItem,
-     MediaFile, FileKeynames, MediaAttachmentFile, ProcessingMetaData,
-     Notification, CommentNotification, ProcessingNotification,
-     CommentSubscription]
+     User, Client, RequestToken, AccessToken, NonceTimestamp, MediaEntry, Tag, 
+     MediaTag, MediaComment, Collection, CollectionItem, MediaFile, FileKeynames, 
+     MediaAttachmentFile, ProcessingMetaData, Notification, CommentNotification,
+     ProcessingNotification, CommentSubscription]
  
 +"""
 + Foundations are the default rows that are created immediately after the tables 
 + are initialized. Each entry to  this dictionary should be in the format of:
 +                 ModelConstructorObject:List of Dictionaries
 + (Each Dictionary represents a row on the Table to be created, containing each
 +  of the columns' names as a key string, and each of the columns' values as a
 +  value)
 +
 + ex. [NOTE THIS IS NOT BASED OFF OF OUR USER TABLE]
 +    user_foundations = [{'name':u'Joanna', 'age':24},
 +                        {'name':u'Andrea', 'age':41}]
 +
 +    FOUNDATIONS = {User:user_foundations}
 +"""
 +FOUNDATIONS = {}
  
  ######################################################
  # Special, migrations-tracking table