diff options
| author | hut <hut@lavabit.com> | 2010-06-09 14:10:06 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-06-09 14:10:06 +0200 |
| commit | a4c9208bb69b09207c017ae88c810ef0ee83a780 (patch) | |
| tree | 1666c23d6d69481587d26669c790b278123b1f0a /test/bm_loader.py | |
| parent | 1d895690f81f2cb3a308416c29b280e91e681e36 (diff) | |
| parent | e74222ee48435895a636812f908c862f3fb7acb6 (diff) | |
| download | ranger-a4c9208bb69b09207c017ae88c810ef0ee83a780.tar.gz | |
Merge branch 'master' into preview
Conflicts: ranger/fsobject/file.py
Diffstat (limited to 'test/bm_loader.py')
| -rw-r--r-- | test/bm_loader.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/bm_loader.py b/test/bm_loader.py index 745e6f3b..968640a5 100644 --- a/test/bm_loader.py +++ b/test/bm_loader.py @@ -18,7 +18,7 @@ from ranger.fsobject import Directory, File from ranger.ext.openstruct import OpenStruct import os.path from ranger.shared import FileManagerAware, SettingsAware -from test import Fake +from testlib import Fake from os.path import realpath, join, dirname from subprocess import Popen, PIPE TESTDIR = realpath(join(dirname(__file__), '/usr/include')) |