Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed some deprecated imports

  • Loading branch information...
commit 55e002e722c850c7b7d36c50693739bd4d7c80e6 1 parent d6e3f55
Tim Cuthbertson authored March 18, 2012
10  mocktest/__init__.py
@@ -50,8 +50,8 @@
50 50
 	:members:
51 51
 
52 52
 """
53  
-from core import *
54  
-from mocktest import *
55  
-from mocking import *
56  
-from matchers import *
57  
-from callrecord import *
  53
+from .core import *
  54
+from .mocktest import *
  55
+from .mocking import *
  56
+from .matchers import *
  57
+from .callrecord import *
2  mocktest/core.py
@@ -6,6 +6,6 @@
6 6
 
7 7
 __unittest = True
8 8
 
9  
-from transaction import MockTransaction
  9
+from .transaction import MockTransaction
10 10
 _setup = MockTransaction.__enter__
11 11
 _teardown = MockTransaction.__exit__
4  mocktest/transaction.py
... ...
@@ -1,4 +1,4 @@
1  
-from mockerror import MockError
  1
+from .mockerror import MockError
2 2
 
3 3
 __unittest = True
4 4
 
@@ -31,7 +31,7 @@ def __exit__(self, *optional_err_info):
31 31
 		for action in reversed(self.teardown_actions):
32 32
 			try:
33 33
 				action()
34  
-			except StandardError, e:
  34
+			except StandardError as e:
35 35
 				errors.append(e)
36 36
 		self.teardown_actions = None
37 37
 		self.started = False

0 notes on commit 55e002e

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