witten
/
luminotes
Archived
1
0
Fork 0

Renaming new_model to model, now that the old bsddb model is out of the way.

This commit is contained in:
Dan Helfman 2007-10-11 19:49:00 +00:00
parent 17ad869635
commit bbebad528e
23 changed files with 34 additions and 34 deletions

View File

@ -6,8 +6,8 @@ from Database import Valid_id, Valid_revision
from Users import grab_user_id
from Expire import strongly_expire
from Html_nuker import Html_nuker
from new_model.Notebook import Notebook
from new_model.Note import Note
from model.Notebook import Notebook
from model.Note import Note
from view.Main_page import Main_page
from view.Json import Json
from view.Html_file import Html_file

View File

@ -5,7 +5,7 @@ from Validate import validate
from Notebooks import Notebooks
from Users import Users
from Database import Valid_id
from new_model.Note import Note
from model.Note import Note
from view.Main_page import Main_page
from view.Json import Json
from view.Error_page import Error_page

View File

@ -2,10 +2,10 @@ import re
import cherrypy
from pytz import utc
from datetime import datetime, timedelta
from new_model.User import User
from new_model.Notebook import Notebook
from new_model.Note import Note
from new_model.Password_reset import Password_reset
from model.User import User
from model.Notebook import Notebook
from model.Note import Note
from model.Password_reset import Password_reset
from Expose import expose
from Validate import validate, Valid_string, Valid_bool, Validation_error
from Database import Valid_id

View File

@ -1,5 +1,5 @@
from datetime import datetime
from new_model.Persistent import Persistent, quote
from model.Persistent import Persistent, quote
def notz_quote( value ):

View File

@ -8,9 +8,9 @@ from StringIO import StringIO
class Test_controller( object ):
def __init__( self ):
from new_model.User import User
from new_model.Notebook import Notebook
from new_model.Note import Note
from model.User import User
from model.Notebook import Notebook
from model.Note import Note
# Since Stub_database isn't a real database and doesn't know SQL, replace some of the
# SQL-returning methods in User, Note, and Notebook to return functions that manipulate data in

View File

@ -2,9 +2,9 @@ import cherrypy
import cgi
from urllib import quote
from Test_controller import Test_controller
from new_model.Notebook import Notebook
from new_model.Note import Note
from new_model.User import User
from model.Notebook import Notebook
from model.Note import Note
from model.User import User
class Test_notebooks( Test_controller ):

View File

@ -1,5 +1,5 @@
import cherrypy
from new_model.User import User
from model.User import User
from controller.Scheduler import Scheduler
from Test_controller import Test_controller

View File

@ -6,10 +6,10 @@ from datetime import datetime, timedelta
from nose.tools import raises
from Test_controller import Test_controller
from Stub_smtp import Stub_smtp
from new_model.User import User
from new_model.Notebook import Notebook
from new_model.Note import Note
from new_model.Password_reset import Password_reset
from model.User import User
from model.Notebook import Notebook
from model.Note import Note
from model.Password_reset import Password_reset
class Test_users( Test_controller ):

View File

@ -1,6 +1,6 @@
from pytz import utc
from datetime import datetime, timedelta
from new_model.Note import Note
from model.Note import Note
class Test_note( object ):

View File

@ -1,7 +1,7 @@
from pytz import utc
from datetime import datetime, timedelta
from new_model.Notebook import Notebook
from new_model.Note import Note
from model.Notebook import Notebook
from model.Note import Note
class Test_notebook( object ):

View File

@ -1,5 +1,5 @@
from new_model.User import User
from new_model.Password_reset import Password_reset
from model.User import User
from model.Password_reset import Password_reset
class Test_password_reset( object ):

View File

@ -1,6 +1,6 @@
from pytz import utc
from datetime import datetime, timedelta
from new_model.Persistent import Persistent, quote
from model.Persistent import Persistent, quote
class Test_persistent( object ):

View File

@ -1,6 +1,6 @@
from pytz import utc
from datetime import datetime, timedelta
from new_model.User import User
from model.User import User
class Test_user( object ):

View File

@ -4,9 +4,9 @@ import os
import os.path
import sys
from controller.Database import Database
from new_model.Notebook import Notebook
from new_model.Note import Note
from new_model.User import User
from model.Notebook import Notebook
from model.Note import Note
from model.User import User
class Initializer( object ):
@ -31,9 +31,9 @@ class Initializer( object ):
self.anonymous = None
if nuke is True:
self.database.execute( file( "new_model/drop.sql" ).read(), commit = False )
self.database.execute( file( "model/drop.sql" ).read(), commit = False )
self.database.execute( file( "new_model/schema.sql" ).read(), commit = False )
self.database.execute( file( "model/schema.sql" ).read(), commit = False )
self.create_main_notebook()
self.create_anonymous_user()

View File

@ -4,9 +4,9 @@ import os
import os.path
from config.Common import settings
from controller.Database import Database
from new_model.Notebook import Notebook
from new_model.Note import Note
from new_model.User import User
from model.Notebook import Notebook
from model.Note import Note
from model.User import User
from tools.initdb import fix_note_contents