diff --git a/python/lib/Lib/site-packages/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/python/lib/Lib/site-packages/django/contrib/admin/templates/admin/delete_selected_confirmation.html index 4aa610e40576..7b190f01a595 100644 --- a/python/lib/Lib/site-packages/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/python/lib/Lib/site-packages/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -5,7 +5,7 @@
{% trans "Home" %} › {{ app_label|capfirst }} › - {{ opts.verbose_name_plural|capfirst }} › + {{ opts.verbose_name_plural|capfirst }} › {% trans 'Delete multiple objects' %}
{% endblock %} diff --git a/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/approve.html b/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/approve.html index 78d15dbb0e00..5540fb45f0c6 100644 --- a/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/approve.html +++ b/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/approve.html @@ -6,7 +6,7 @@ {% block content %}

{% trans "Really make this comment public?" %}

{{ comment|linebreaks }}
-
{% csrf_token %} + {% csrf_token %} {% if next %}
{% endif %}

or cancel diff --git a/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/delete.html b/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/delete.html index 50c9a4d1b18a..532755e37c11 100644 --- a/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/delete.html +++ b/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/delete.html @@ -6,7 +6,7 @@ {% block content %}

{% trans "Really remove this comment?" %}

{{ comment|linebreaks }}
- {% csrf_token %} + {% csrf_token %} {% if next %}
{% endif %}

or cancel diff --git a/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/flag.html b/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/flag.html index ca7c77f111be..82bae29cae39 100644 --- a/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/flag.html +++ b/python/lib/Lib/site-packages/django/contrib/comments/templates/comments/flag.html @@ -6,7 +6,7 @@ {% block content %}

{% trans "Really flag this comment?" %}

{{ comment|linebreaks }}
- {% csrf_token %} + {% csrf_token %} {% if next %}
{% endif %}

or cancel diff --git a/python/lib/Lib/site-packages/django/contrib/gis/tests/geo3d/tests.py b/python/lib/Lib/site-packages/django/contrib/gis/tests/geo3d/tests.py index f57445c4ebd7..c554bb62fe57 100644 --- a/python/lib/Lib/site-packages/django/contrib/gis/tests/geo3d/tests.py +++ b/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') diff --git a/python/lib/Lib/site-packages/django/contrib/gis/tests/geogapp/tests.py b/python/lib/Lib/site-packages/django/contrib/gis/tests/geogapp/tests.py index cb69ce94e1f2..fa7e4815501f 100644 --- a/python/lib/Lib/site-packages/django/contrib/gis/tests/geogapp/tests.py +++ b/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', diff --git a/python/lib/Lib/unicodedata.py b/python/lib/Lib/unicodedata.py index 682bc4b4b66c..6e6f5eb477fc 100644 --- a/python/lib/Lib/unicodedata.py +++ b/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() diff --git a/python/lib/cachedir/packages/AppleScriptEngine.pkc b/python/lib/cachedir/packages/AppleScriptEngine.pkc new file mode 100644 index 000000000000..352997f562de Binary files /dev/null and b/python/lib/cachedir/packages/AppleScriptEngine.pkc differ diff --git a/python/lib/cachedir/packages/MRJToolkit.pkc b/python/lib/cachedir/packages/MRJToolkit.pkc new file mode 100644 index 000000000000..3bbf971094da Binary files /dev/null and b/python/lib/cachedir/packages/MRJToolkit.pkc differ diff --git a/python/lib/cachedir/packages/QTJava.pkc b/python/lib/cachedir/packages/QTJava.pkc new file mode 100644 index 000000000000..462a0df3726e Binary files /dev/null and b/python/lib/cachedir/packages/QTJava.pkc differ diff --git a/python/lib/cachedir/packages/apple_provider.pkc b/python/lib/cachedir/packages/apple_provider.pkc new file mode 100644 index 000000000000..37e7ab3b49b1 Binary files /dev/null and b/python/lib/cachedir/packages/apple_provider.pkc differ diff --git a/python/lib/cachedir/packages/charsets.pkc b/python/lib/cachedir/packages/charsets.pkc new file mode 100644 index 000000000000..99f1b9dd9761 Binary files /dev/null and b/python/lib/cachedir/packages/charsets.pkc differ diff --git a/python/lib/cachedir/packages/classes.pkc b/python/lib/cachedir/packages/classes.pkc new file mode 100644 index 000000000000..91ae8dddfe60 Binary files /dev/null and b/python/lib/cachedir/packages/classes.pkc differ diff --git a/python/lib/cachedir/packages/dns_sd.pkc b/python/lib/cachedir/packages/dns_sd.pkc new file mode 100644 index 000000000000..fc4aebfcfd93 Binary files /dev/null and b/python/lib/cachedir/packages/dns_sd.pkc differ diff --git a/python/lib/cachedir/packages/dnsns.pkc b/python/lib/cachedir/packages/dnsns.pkc new file mode 100644 index 000000000000..3fb04ac66625 Binary files /dev/null and b/python/lib/cachedir/packages/dnsns.pkc differ diff --git a/python/lib/cachedir/packages/j3daudio.pkc b/python/lib/cachedir/packages/j3daudio.pkc new file mode 100644 index 000000000000..2340ed4b5e2d Binary files /dev/null and b/python/lib/cachedir/packages/j3daudio.pkc differ diff --git a/python/lib/cachedir/packages/j3dcore.pkc b/python/lib/cachedir/packages/j3dcore.pkc new file mode 100644 index 000000000000..4437ae83b121 Binary files /dev/null and b/python/lib/cachedir/packages/j3dcore.pkc differ diff --git a/python/lib/cachedir/packages/j3dutils.pkc b/python/lib/cachedir/packages/j3dutils.pkc new file mode 100644 index 000000000000..8e026949c1f5 Binary files /dev/null and b/python/lib/cachedir/packages/j3dutils.pkc differ diff --git a/python/lib/cachedir/packages/jai_codec.pkc b/python/lib/cachedir/packages/jai_codec.pkc new file mode 100644 index 000000000000..171de460765e Binary files /dev/null and b/python/lib/cachedir/packages/jai_codec.pkc differ diff --git a/python/lib/cachedir/packages/jai_core.pkc b/python/lib/cachedir/packages/jai_core.pkc new file mode 100644 index 000000000000..cc6ab58df66c Binary files /dev/null and b/python/lib/cachedir/packages/jai_core.pkc differ diff --git a/python/lib/cachedir/packages/jce.pkc b/python/lib/cachedir/packages/jce.pkc new file mode 100644 index 000000000000..767b39fd3436 Binary files /dev/null and b/python/lib/cachedir/packages/jce.pkc differ diff --git a/python/lib/cachedir/packages/jsse.pkc b/python/lib/cachedir/packages/jsse.pkc new file mode 100644 index 000000000000..d0f5dcbdb811 Binary files /dev/null and b/python/lib/cachedir/packages/jsse.pkc differ diff --git a/python/lib/cachedir/packages/jython.pkc b/python/lib/cachedir/packages/jython.pkc new file mode 100644 index 000000000000..7f2ec8a59212 Binary files /dev/null and b/python/lib/cachedir/packages/jython.pkc differ diff --git a/python/lib/cachedir/packages/localedata.pkc b/python/lib/cachedir/packages/localedata.pkc new file mode 100644 index 000000000000..d3a3a4a43138 Binary files /dev/null and b/python/lib/cachedir/packages/localedata.pkc differ diff --git a/python/lib/cachedir/packages/mlibwrapper_jai.pkc b/python/lib/cachedir/packages/mlibwrapper_jai.pkc new file mode 100644 index 000000000000..c3660e3f8b13 Binary files /dev/null and b/python/lib/cachedir/packages/mlibwrapper_jai.pkc differ diff --git a/python/lib/cachedir/packages/packages.idx b/python/lib/cachedir/packages/packages.idx new file mode 100644 index 000000000000..8cc83b6c6dc1 Binary files /dev/null and b/python/lib/cachedir/packages/packages.idx differ diff --git a/python/lib/cachedir/packages/sunjce_provider.pkc b/python/lib/cachedir/packages/sunjce_provider.pkc new file mode 100644 index 000000000000..102d832e71af Binary files /dev/null and b/python/lib/cachedir/packages/sunjce_provider.pkc differ diff --git a/python/lib/cachedir/packages/sunpkcs11.pkc b/python/lib/cachedir/packages/sunpkcs11.pkc new file mode 100644 index 000000000000..dd580f0aec05 Binary files /dev/null and b/python/lib/cachedir/packages/sunpkcs11.pkc differ diff --git a/python/lib/cachedir/packages/ui.pkc b/python/lib/cachedir/packages/ui.pkc new file mode 100644 index 000000000000..a3b1d0b4dda2 Binary files /dev/null and b/python/lib/cachedir/packages/ui.pkc differ diff --git a/python/lib/cachedir/packages/vecmath.pkc b/python/lib/cachedir/packages/vecmath.pkc new file mode 100644 index 000000000000..9de73ea56c93 Binary files /dev/null and b/python/lib/cachedir/packages/vecmath.pkc differ diff --git a/python/python.iml b/python/python.iml index 6e7890b1f92d..0e9958205a21 100644 --- a/python/python.iml +++ b/python/python.iml @@ -5,7 +5,7 @@ - + diff --git a/python/src/com/jetbrains/python/testing/JythonUnitTestUtil.java b/python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java similarity index 92% rename from python/src/com/jetbrains/python/testing/JythonUnitTestUtil.java rename to python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java index bb90cd76b6f0..ab4f5b4d42e9 100644 --- a/python/src/com/jetbrains/python/testing/JythonUnitTestUtil.java +++ b/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);