Skip to content
This repository
Browse code

Couple of small corrections

  • Loading branch information...
commit a52195aa454d85aa69c3104d6cc4ae2ac9acd843 1 parent 0723bc6
Rafal Stozek authored February 14, 2013
2  pytest_django/db_reuse.py
@@ -6,8 +6,6 @@
6 6
 import sys
7 7
 import types
8 8
 
9  
-import py
10  
-
11 9
 
12 10
 def can_support_db_reuse(connection):
13 11
     """Return whether it makes any sense to use REUSE_DB with the backend of a connection."""
2  pytest_django/django_compat.py
@@ -11,7 +11,7 @@ def is_django_unittest(item):
11 11
         from django.test import TestCase
12 12
 
13 13
     if sys.version_info < (3, 0):
14  
-    	return (hasattr(item.obj, 'im_class') and
  14
+        return (hasattr(item.obj, 'im_class') and
15 15
         	    issubclass(item.obj.im_class, TestCase))
16 16
 
17 17
     return (hasattr(item.obj, '__self__') and
2  pytest_django/fixtures.py
@@ -204,7 +204,7 @@ def _live_server_helper(request):
204 204
 
205 205
     This helper will dynamically request the transactional_db fixture
206 206
     for a tests which uses the live_server fixture.  This allows the
207  
-    server and test to access the database whithout having to mark
  207
+    server and test to access the database without having to mark
208 208
     this explicitly which is handy since it is usually required and
209 209
     matches the Django behaviour.
210 210
 
2  pytest_django/live_server_helper.py
... ...
@@ -1,5 +1,5 @@
1 1
 import sys
2  
-import py
  2
+import pytest
3 3
 
4 4
 def supported():
5 5
     import django.test.testcases
2  pytest_django/plugin.py
@@ -120,7 +120,7 @@ def _django_runner(request):
120 120
 def _django_cursor_wrapper(request):
121 121
     """The django cursor wrapper, internal to pytest-django
122 122
 
123  
-    This will gobally disable all database access.  The object
  123
+    This will globally disable all database access. The object
124 124
     returned has a .enable() and a .disable() method which can be used
125 125
     to temporarily enable database access.
126 126
     """
2  tests/test_database.py
@@ -9,7 +9,7 @@
9 9
 def noop_transactions():
10 10
     """Test whether transactions are disabled
11 11
 
12  
-    Return True if tranactions are disabled, False if they are
  12
+    Return True if transactions are disabled, False if they are
13 13
     enabled.
14 14
     """
15 15
     # A rollback will only work if transactions are enabled.
4  tests/test_db_setup.py
... ...
@@ -1,4 +1,4 @@
1  
-import py
  1
+import pytest
2 2
 
3 3
 from django.conf import settings
4 4
 
@@ -14,7 +14,7 @@ def test_db_reuse(django_testdir):
14 14
     """
15 15
 
16 16
     if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
17  
-        py.test.skip('Do not test db reuse since database does not support it')
  17
+        pytest.skip('Do not test db reuse since database does not support it')
18 18
 
19 19
     create_test_module(django_testdir, '''
20 20
 import pytest

0 notes on commit a52195a

Please sign in to comment.
Something went wrong with that request. Please try again.