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/tc_displayable.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/tc_displayable.py')
-rw-r--r-- | test/tc_displayable.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/tc_displayable.py b/test/tc_displayable.py index 50f37845..1c66a40e 100644 --- a/test/tc_displayable.py +++ b/test/tc_displayable.py @@ -13,14 +13,12 @@ # 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 curses from random import randint from ranger.gui.displayable import Displayable, DisplayableContainer -from test import Fake, OK, raise_ok, TODO +from testlib import Fake, OK, raise_ok, TODO class TestWithFakeCurses(unittest.TestCase): def setUp(self): |