diff --git a/controller/Notebooks.py b/controller/Notebooks.py index c39a3e7..18f919b 100644 --- a/controller/Notebooks.py +++ b/controller/Notebooks.py @@ -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 diff --git a/controller/Root.py b/controller/Root.py index a3f0b5f..1338b3e 100644 --- a/controller/Root.py +++ b/controller/Root.py @@ -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 diff --git a/controller/Users.py b/controller/Users.py index c440542..93ae580 100644 --- a/controller/Users.py +++ b/controller/Users.py @@ -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 diff --git a/controller/test/Stub_object.py b/controller/test/Stub_object.py index 6daef90..94811e1 100644 --- a/controller/test/Stub_object.py +++ b/controller/test/Stub_object.py @@ -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 ): diff --git a/controller/test/Test_controller.py b/controller/test/Test_controller.py index a1b3ed2..74f8482 100644 --- a/controller/test/Test_controller.py +++ b/controller/test/Test_controller.py @@ -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 diff --git a/controller/test/Test_notebooks.py b/controller/test/Test_notebooks.py index 8f41209..c3add00 100644 --- a/controller/test/Test_notebooks.py +++ b/controller/test/Test_notebooks.py @@ -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 ): diff --git a/controller/test/Test_root.py b/controller/test/Test_root.py index 7ae37e3..1875463 100644 --- a/controller/test/Test_root.py +++ b/controller/test/Test_root.py @@ -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 diff --git a/controller/test/Test_users.py b/controller/test/Test_users.py index ff18200..eca491d 100644 --- a/controller/test/Test_users.py +++ b/controller/test/Test_users.py @@ -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 ): diff --git a/new_model/Note.py b/model/Note.py similarity index 100% rename from new_model/Note.py rename to model/Note.py diff --git a/new_model/Notebook.py b/model/Notebook.py similarity index 100% rename from new_model/Notebook.py rename to model/Notebook.py diff --git a/new_model/Password_reset.py b/model/Password_reset.py similarity index 100% rename from new_model/Password_reset.py rename to model/Password_reset.py diff --git a/new_model/Persistent.py b/model/Persistent.py similarity index 100% rename from new_model/Persistent.py rename to model/Persistent.py diff --git a/new_model/User.py b/model/User.py similarity index 100% rename from new_model/User.py rename to model/User.py diff --git a/new_model/__init__.py b/model/__init__.py similarity index 100% rename from new_model/__init__.py rename to model/__init__.py diff --git a/new_model/drop.sql b/model/drop.sql similarity index 100% rename from new_model/drop.sql rename to model/drop.sql diff --git a/new_model/schema.sql b/model/schema.sql similarity index 100% rename from new_model/schema.sql rename to model/schema.sql diff --git a/new_model/test/Test_note.py b/model/test/Test_note.py similarity index 99% rename from new_model/test/Test_note.py rename to model/test/Test_note.py index 172635a..98ec339 100644 --- a/new_model/test/Test_note.py +++ b/model/test/Test_note.py @@ -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 ): diff --git a/new_model/test/Test_notebook.py b/model/test/Test_notebook.py similarity index 96% rename from new_model/test/Test_notebook.py rename to model/test/Test_notebook.py index e6de2eb..19cc38e 100644 --- a/new_model/test/Test_notebook.py +++ b/model/test/Test_notebook.py @@ -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 ): diff --git a/new_model/test/Test_password_reset.py b/model/test/Test_password_reset.py similarity index 93% rename from new_model/test/Test_password_reset.py rename to model/test/Test_password_reset.py index 80c2b4f..9e953c3 100644 --- a/new_model/test/Test_password_reset.py +++ b/model/test/Test_password_reset.py @@ -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 ): diff --git a/new_model/test/Test_persistent.py b/model/test/Test_persistent.py similarity index 97% rename from new_model/test/Test_persistent.py rename to model/test/Test_persistent.py index 49f2a54..93f8515 100644 --- a/new_model/test/Test_persistent.py +++ b/model/test/Test_persistent.py @@ -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 ): diff --git a/new_model/test/Test_user.py b/model/test/Test_user.py similarity index 98% rename from new_model/test/Test_user.py rename to model/test/Test_user.py index 3ba8fa9..f454810 100644 --- a/new_model/test/Test_user.py +++ b/model/test/Test_user.py @@ -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 ): diff --git a/tools/initdb.py b/tools/initdb.py index 3b06b3e..072c86e 100644 --- a/tools/initdb.py +++ b/tools/initdb.py @@ -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() diff --git a/tools/updatedb.py b/tools/updatedb.py index 6cbc04f..0b9e743 100755 --- a/tools/updatedb.py +++ b/tools/updatedb.py @@ -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