Merge branch 'master' into cp

Conflicts:
	ranger/__main__.py
	ranger/core/actions.py

1 files changed, 5 insertions, 2 deletions

diff --git a/test/tc_directory.py b/test/tc_directory.py
index 024ebc9d..754253b3 100644
--- a/test/tc_directory.py
+++ b/test/tc_directory.py
@@ -13,9 +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 os.path
 import sys
+rangerpath = os.path.join(os.path.dirname(__file__), '..')
+if sys.path[1] != rangerpath:
+	sys.path[1:1] = [rangerpath]
+
 from os.path import realpath, join, dirname
 
 from ranger import fsobject