From cfdb655eeef70c12c027be77bc554a210c68e24e Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 25 Mar 2013 16:50:46 +0100
Subject: [PATCH] Fixed path evaluation.

---
 .../jetbrains/python/psi/impl/PyPathEvaluator.java    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/python/src/com/jetbrains/python/psi/impl/PyPathEvaluator.java b/python/src/com/jetbrains/python/psi/impl/PyPathEvaluator.java
index ce8e00216acb..559c20ba52d3 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyPathEvaluator.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyPathEvaluator.java
@@ -98,18 +98,13 @@ public class PyPathEvaluator {
   }
 
   public static String evaluatePathInJoin(String containingFilePath, PyExpression[] args, int endElement, Set<PyExpression> visited) {
-    String result = null;
+    String result = containingFilePath;
     for (int i = 0; i < endElement; i++) {
-      String arg = evaluate(args[i], containingFilePath, visited);
+      String arg = evaluate(args[i], result, visited);
       if (arg == null) {
         return null;
       }
-      if (result == null) {
-        result = arg;
-      }
-      else {
-        result = new File(result, arg).getPath();
-      }
+      result = arg;
     }
     return result;
   }