Jython is used by tests in community, so it needs to be in community as well

python/lib/Lib/site-packages/django/contrib/admin/templates/admin/delete_selected_confirmation.html

@@ -5,7 +5,7 @@
 <div class="breadcrumbs">
      <a href="../../">{% trans "Home" %}</a> &rsaquo;
      <a href="../">{{ app_label|capfirst }}</a> &rsaquo;
-     <a href="./">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
+     <a href="">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      {% trans 'Delete multiple objects' %}
 </div>
 {% endblock %}

python/lib/Lib/site-packages/django/contrib/comments/templates/comments/approve.html

@@ -6,7 +6,7 @@
 {% block content %}
   <h1>{% trans "Really make this comment public?" %}</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
-  <form action="." method="post">{% csrf_token %}
+  <form action="" method="post">{% csrf_token %}
     {% if next %}<div><input type="hidden" name="next" value="{{ next }}" id="next" /></div>{% endif %}
     <p class="submit">
       <input type="submit" name="submit" value="{% trans "Approve" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

python/lib/Lib/site-packages/django/contrib/comments/templates/comments/delete.html

@@ -6,7 +6,7 @@
 {% block content %}
 <h1>{% trans "Really remove this comment?" %}</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
-  <form action="." method="post">{% csrf_token %}
+  <form action="" method="post">{% csrf_token %}
     {% if next %}<div><input type="hidden" name="next" value="{{ next }}" id="next" /></div>{% endif %}
     <p class="submit">
     <input type="submit" name="submit" value="{% trans "Remove" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

python/lib/Lib/site-packages/django/contrib/comments/templates/comments/flag.html

@@ -6,7 +6,7 @@
 {% block content %}
 <h1>{% trans "Really flag this comment?" %}</h1>
   <blockquote>{{ comment|linebreaks }}</blockquote>
-  <form action="." method="post">{% csrf_token %}
+  <form action="" method="post">{% csrf_token %}
     {% if next %}<div><input type="hidden" name="next" value="{{ next }}" id="next" /></div>{% endif %}
     <p class="submit">
     <input type="submit" name="submit" value="{% trans "Flag" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

python/lib/Lib/site-packages/django/contrib/gis/tests/geo3d/tests.py

@@ -9,7 +9,7 @@ from models import City3D, Interstate2D, Interstate3D, \
     InterstateProj2D, InterstateProj3D, \
     Point2D, Point3D, MultiPoint3D, Polygon2D, Polygon3D
 
-data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
+data_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '../', 'data'))
 city_file = os.path.join(data_path, 'cities', 'cities.shp')
 vrt_file = os.path.join(data_path, 'test_vrt', 'test_vrt.vrt')
 

python/lib/Lib/site-packages/django/contrib/gis/tests/geogapp/tests.py

@@ -56,7 +56,7 @@ class GeographyTest(TestCase):
         from django.contrib.gis.utils import LayerMapping
 
         # Getting the shapefile and mapping dictionary.
-        shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
+        shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '../', 'data'))
         co_shp = os.path.join(shp_path, 'counties', 'counties.shp')
         co_mapping = {'name' : 'Name',
                       'state' : 'State',

python/lib/Lib/unicodedata.py

@@ -223,7 +223,7 @@ def init():
 
     my_path = os.path.dirname(__file__)
     loader = pkgutil.get_loader('unicodedata')
-    init_unicodedata(StringIO.StringIO(loader.get_data(os.path.join(my_path,'UnicodeData.txt'))))
-    init_east_asian_width(StringIO.StringIO(loader.get_data(os.path.join(my_path,'EastAsianWidth.txt'))))
+    init_unicodedata(StringIO.StringIO(loader.get_data(os.path.join(my_path, 'UnicodeData.txt'))))
+    init_east_asian_width(StringIO.StringIO(loader.get_data(os.path.join(my_path, 'EastAsianWidth.txt'))))
 
 init()

python/python.iml

@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/pluginResources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/lib/cachedir" />
+      <excludeFolder url="file://$MODULE_DIR$/community/lib/cachedir" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java

@@ -5,11 +5,11 @@ import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.configurations.SimpleJavaParameters;
 import com.intellij.execution.process.CapturingProcessHandler;
 import com.intellij.execution.process.ProcessOutput;
-import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.projectRoots.JdkUtil;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SimpleJavaSdkType;
 import com.intellij.util.SystemProperties;
+import com.jetbrains.python.fixtures.PyTestCase;
 
 import java.io.File;
 
@@ -27,7 +27,7 @@ public class JythonUnitTestUtil {
     parameters.setJdk(ideaJdk);
     parameters.setMainClass("org.python.util.jython");
 
-    File jythonJar = new File(PathManager.getHomePath(), "python/lib/jython.jar");
+    File jythonJar = new File(PyTestCase.getPythonCommunityPath(), "lib/jython.jar");
     parameters.getClassPath().add(jythonJar.getPath());
 
     parameters.getProgramParametersList().add("-Dpython.path=" + pythonPath + File.pathSeparator + workDir);