From 7e1d23308c0a7089895d35da3e99409c3f960fa8 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 2 Feb 2012 14:31:42 -0500
Subject: [PATCH] yet another rename, from auth -> user -> student

--HG--
rename : user/__init__.py => student/__init__.py
rename : user/migrations/0001_initial.py => student/migrations/0001_initial.py
rename : user/migrations/0002_text_to_varchar_and_indexes.py => student/migrations/0002_text_to_varchar_and_indexes.py
rename : user/migrations/__init__.py => student/migrations/__init__.py
rename : user/models.py => student/models.py
rename : user/tests.py => student/tests.py
rename : user/views.py => student/views.py
---
 courseware/content_parser.py                     |  2 +-
 courseware/module_render.py                      |  2 +-
 courseware/views.py                              |  2 +-
 settings_new_askbot.py                           |  2 +-
 {user => student}/__init__.py                    |  0
 {user => student}/migrations/0001_initial.py     | 10 +++++-----
 .../0002_text_to_varchar_and_indexes.py          |  6 +++---
 {user => student}/migrations/__init__.py         |  0
 {user => student}/models.py                      |  0
 {user => student}/tests.py                       |  0
 {user => student}/views.py                       |  0
 urls.py                                          | 16 ++++++++--------
 12 files changed, 20 insertions(+), 20 deletions(-)
 rename {user => student}/__init__.py (100%)
 rename {user => student}/migrations/0001_initial.py (97%)
 rename {user => student}/migrations/0002_text_to_varchar_and_indexes.py (98%)
 rename {user => student}/migrations/__init__.py (100%)
 rename {user => student}/models.py (100%)
 rename {user => student}/tests.py (100%)
 rename {user => student}/views.py (100%)

diff --git a/courseware/content_parser.py b/courseware/content_parser.py
index 75b14acbbe..90f7aefb79 100644
--- a/courseware/content_parser.py
+++ b/courseware/content_parser.py
@@ -7,7 +7,7 @@ from mako.lookup import TemplateLookup
 
 try: # This lets us do __name__ == ='__main__'
     from django.conf import settings
-    from user.models import UserProfile
+    from student.models import UserProfile
 except: 
     settings = None 
 
diff --git a/courseware/module_render.py b/courseware/module_render.py
index b4a0f994ba..5dfc5e1b3b 100644
--- a/courseware/module_render.py
+++ b/courseware/module_render.py
@@ -20,7 +20,7 @@ from django.template import Context, loader
 from mitxmako.shortcuts import render_to_response, render_to_string
 
 from models import StudentModule
-from user.models import UserProfile
+from student.models import UserProfile
 import track.views
 
 import courseware.content_parser as content_parser
diff --git a/courseware/views.py b/courseware/views.py
index a292c577b1..ec514efd98 100644
--- a/courseware/views.py
+++ b/courseware/views.py
@@ -19,7 +19,7 @@ from lxml import etree
 
 from module_render import render_module, modx_dispatch
 from models import StudentModule
-from user.models import UserProfile
+from student.models import UserProfile
 
 import courseware.content_parser as content_parser
 import courseware.modules.capa_module
diff --git a/settings_new_askbot.py b/settings_new_askbot.py
index 30513c260a..925c7ddd4b 100644
--- a/settings_new_askbot.py
+++ b/settings_new_askbot.py
@@ -112,7 +112,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'courseware',
-    'user',
+    'student',
     'django.contrib.humanize',
     'static_template_view',
     'staticbook',
diff --git a/user/__init__.py b/student/__init__.py
similarity index 100%
rename from user/__init__.py
rename to student/__init__.py
diff --git a/user/migrations/0001_initial.py b/student/migrations/0001_initial.py
similarity index 97%
rename from user/migrations/0001_initial.py
rename to student/migrations/0001_initial.py
index e8fa02e1f5..cab5690ea7 100644
--- a/user/migrations/0001_initial.py
+++ b/student/migrations/0001_initial.py
@@ -18,7 +18,7 @@ class Migration(SchemaMigration):
             ('meta', self.gf('django.db.models.fields.TextField')(blank=True)),
             ('courseware', self.gf('django.db.models.fields.TextField')(default='course.xml', blank=True)),
         ))
-        db.send_create_signal('user', ['UserProfile'])
+        db.send_create_signal('student', ['UserProfile'])
 
         # Adding model 'Registration'
         db.create_table('auth_registration', (
@@ -26,7 +26,7 @@ class Migration(SchemaMigration):
             ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], unique=True)),
             ('activation_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=32, db_index=True)),
         ))
-        db.send_create_signal('user', ['Registration'])
+        db.send_create_signal('student', ['Registration'])
 
 
     def backwards(self, orm):
@@ -100,13 +100,13 @@ class Migration(SchemaMigration):
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        'user.registration': {
+        'student.registration': {
             'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
             'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
         },
-        'user.userprofile': {
+        'student.userprofile': {
             'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
             'courseware': ('django.db.models.fields.TextField', [], {'default': "'course.xml'", 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
@@ -118,4 +118,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['user']
+    complete_apps = ['student']
diff --git a/user/migrations/0002_text_to_varchar_and_indexes.py b/student/migrations/0002_text_to_varchar_and_indexes.py
similarity index 98%
rename from user/migrations/0002_text_to_varchar_and_indexes.py
rename to student/migrations/0002_text_to_varchar_and_indexes.py
index 9e144eb335..a75f164f3a 100644
--- a/user/migrations/0002_text_to_varchar_and_indexes.py
+++ b/student/migrations/0002_text_to_varchar_and_indexes.py
@@ -122,13 +122,13 @@ class Migration(SchemaMigration):
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        'user.registration': {
+        'student.registration': {
             'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
             'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
         },
-        'user.userprofile': {
+        'student.userprofile': {
             'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
             'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
@@ -140,4 +140,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['user']
+    complete_apps = ['student']
diff --git a/user/migrations/__init__.py b/student/migrations/__init__.py
similarity index 100%
rename from user/migrations/__init__.py
rename to student/migrations/__init__.py
diff --git a/user/models.py b/student/models.py
similarity index 100%
rename from user/models.py
rename to student/models.py
diff --git a/user/tests.py b/student/tests.py
similarity index 100%
rename from user/tests.py
rename to student/tests.py
diff --git a/user/views.py b/student/views.py
similarity index 100%
rename from user/views.py
rename to student/views.py
diff --git a/urls.py b/urls.py
index b10fde59c0..71a427f498 100644
--- a/urls.py
+++ b/urls.py
@@ -10,13 +10,13 @@ import django.contrib.auth.views
 urlpatterns = ('',
     url(r'^event$', 'track.views.user_track'),
     url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),
-    url(r'^logout$', 'user.views.logout_user'),
+    url(r'^logout$', 'student.views.logout_user'),
     url(r'^info$', 'util.views.info'),
-    url(r'^login$', 'user.views.login_user'),
-    url(r'^login/(?P<error>[^/]*)$', 'user.views.login_user'),
-    url(r'^create_account$', 'user.views.create_account'),
-    url(r'^activate/(?P<key>[^/]*)$', 'user.views.activate_account'),
-    url(r'^$', 'user.views.index'),
+    url(r'^login$', 'student.views.login_user'),
+    url(r'^login/(?P<error>[^/]*)$', 'student.views.login_user'),
+    url(r'^create_account$', 'student.views.create_account'),
+    url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account'),
+    url(r'^$', 'student.views.index'),
     url(r'^password_reset/$', 'django.contrib.auth.views.password_reset', 
         dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'),
 #    url(r'^password_reset/$', 'auth.views.password_reset'),
@@ -42,12 +42,12 @@ url(r'^wiki/', include('simplewiki.urls')),
     url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index'),
     url(r'^modx/(?P<module>[^/]*)/(?P<id>[^/]*)/(?P<dispatch>[^/]*)$', 'courseware.views.modx_dispatch'), #reset_problem'),
     url(r'^profile$', 'courseware.views.profile'),
-    url(r'^change_setting$', 'user.views.change_setting'),
+    url(r'^change_setting$', 'student.views.change_setting'),
     url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
     url(r'^book/(?P<page>[^/]*)$', 'staticbook.views.index'), 
     url(r'^book-shifted/(?P<page>[^/]*)$', 'staticbook.views.index_shifted'), 
     url(r'^book*$', 'staticbook.views.index'), 
-#    url(r'^course_info/$', 'user.views.courseinfo'),
+#    url(r'^course_info/$', 'student.views.courseinfo'),
 #    url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
     url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
     url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),