Merge branch 'master' into preview

Conflicts:
	ranger/fsobject/file.py

1 files changed, 1 insertions, 3 deletions

diff --git a/test/tc_loader.py b/test/tc_loader.py
index 53ac5617..9f7f7322 100644
--- a/test/tc_loader.py
+++ b/test/tc_loader.py
@@ -13,13 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if __name__ == '__main__': from __init__ import init; init()
-
 import unittest
 import os
 from os.path import realpath, join, dirname
 
-from test import Fake
+from testlib import Fake
 from ranger.shared import FileManagerAware, SettingsAware
 from ranger.core.loader import Loader
 from ranger.fsobject import Directory, File