about summary refs log tree commit diff stats
path: root/test/tc_keyapi.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-06-09 14:10:06 +0200
committerhut <hut@lavabit.com>2010-06-09 14:10:06 +0200
commita4c9208bb69b09207c017ae88c810ef0ee83a780 (patch)
tree1666c23d6d69481587d26669c790b278123b1f0a /test/tc_keyapi.py
parent1d895690f81f2cb3a308416c29b280e91e681e36 (diff)
parente74222ee48435895a636812f908c862f3fb7acb6 (diff)
downloadranger-a4c9208bb69b09207c017ae88c810ef0ee83a780.tar.gz
Merge branch 'master' into preview
Conflicts:
	ranger/fsobject/file.py
Diffstat (limited to 'test/tc_keyapi.py')
-rw-r--r--test/tc_keyapi.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/tc_keyapi.py b/test/tc_keyapi.py
index 2f522173..48282a7d 100644
--- a/test/tc_keyapi.py
+++ b/test/tc_keyapi.py
@@ -13,8 +13,6 @@
 # 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()
-
 from unittest import TestCase, main
 
 class Test(TestCase):