Use django_dynamic_fixture's new/get instead of N/G

Based on feedback:
#1503 (comment)

Author: gregmuellegger

readthedocs/rtd_tests/tests/test_subproject.py

@@ -1,15 +1,15 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
-from django_dynamic_fixture import G
+from django_dynamic_fixture import get
 
 from readthedocs.projects.forms import SubprojectForm
 from readthedocs.projects.models import Project
 
 
 class SubprojectFormTests(TestCase):
     def test_name_validation(self):
-        user = G(User)
-        project = G(Project, slug='mainproject')
+        user = get(User)
+        project = get(Project, slug='mainproject')
 
         form = SubprojectForm({},
                               parent=project, user=user)
@@ -25,10 +25,10 @@ def test_adding_subproject_fails_when_user_is_not_admin(self):
         # Make sure that a user cannot add a subproject that he is not the
         # admin of.
 
-        user = G(User)
-        project = G(Project, slug='mainproject')
+        user = get(User)
+        project = get(Project, slug='mainproject')
         project.users.add(user)
-        subproject = G(Project, slug='subproject')
+        subproject = get(Project, slug='subproject')
 
         form = SubprojectForm({'subproject': subproject.slug},
                               parent=project, user=user)
@@ -37,10 +37,10 @@ def test_adding_subproject_fails_when_user_is_not_admin(self):
         self.assertTrue('subproject' in form.errors)
 
     def test_admin_of_subproject_can_add_it(self):
-        user = G(User)
-        project = G(Project, slug='mainproject')
+        user = get(User)
+        project = get(Project, slug='mainproject')
         project.users.add(user)
-        subproject = G(Project, slug='subproject')
+        subproject = get(Project, slug='subproject')
         subproject.users.add(user)
 
         # Works now as user is admin of subproject.

readthedocs/rtd_tests/tests/test_views.py

@@ -2,7 +2,8 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.utils.six.moves.urllib.parse import urlsplit
-from django_dynamic_fixture import G, N
+from django_dynamic_fixture import get
+from django_dynamic_fixture import new
 
 from readthedocs.builds.constants import LATEST
 from readthedocs.projects.models import Project
@@ -173,12 +174,12 @@ def test_project_redirects_delete(self):
 
 class SubprojectViewTests(TestCase):
     def setUp(self):
-        self.user = N(User, username='test')
+        self.user = new(User, username='test')
         self.user.set_password('test')
         self.user.save()
 
-        self.project = G(Project, slug='my-mainproject')
-        self.subproject = G(Project, slug='my-subproject')
+        self.project = get(Project, slug='my-mainproject')
+        self.subproject = get(Project, slug='my-subproject')
         self.project.add_subproject(self.subproject)
 
         self.client.login(username='test', password='test')