From b9df7ebeb4fbb2801e3ce151937a5ffa39e5290f Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Wed, 27 Jun 2012 14:14:21 +0200
Subject: [PATCH 1/3] End block name completion, resolve and matching
 open-close inspection (PY-420).

---
 python/src/META-INF/python-plugin-common.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index c8684329a267..01ec72aeb8f6 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -463,6 +463,9 @@
     <localInspection language="DjangoTemplate" shortName="DjangoUnresolvedLoadInspection" bundle="com.jetbrains.django.ui.Django"
                      key="inspection.unresolved-load.display-name" groupKey="django" enabledByDefault="true" level="WARNING"
                      implementationClass="com.jetbrains.django.lang.template.inspection.UnresolvedLoadReferenceInspection"/>
+    <localInspection language="DjangoTemplate" shortName="EndBlockNamesInspection" bundle="com.jetbrains.django.ui.Django"
+                     key="inspection.end-block-name.display-name" groupKey="django" enabledByDefault="true" level="WARNING"
+                     implementationClass="com.jetbrains.django.lang.template.inspection.EndBlockNamesInspection"/>
 
     <moduleService serviceInterface="com.jetbrains.django.model.TemplateManager"
                    serviceImplementation="com.jetbrains.django.model.TemplateManager"/>

From 9af8b465ba5e203cc4225534929c6d8314a59000 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Wed, 27 Jun 2012 15:56:20 +0200
Subject: [PATCH 2/3] Fixed django identifier parsing (PY-6831).

---
 python/src/com/jetbrains/python/PyNames.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/PyNames.java b/python/src/com/jetbrains/python/PyNames.java
index 6287a1248e1d..d187fc7e31fc 100644
--- a/python/src/com/jetbrains/python/PyNames.java
+++ b/python/src/com/jetbrains/python/PyNames.java
@@ -339,7 +339,11 @@ public class PyNames {
    * @return true iff name is not reserved and is a well-formed identifier.
    */
   public static boolean isIdentifier(@NotNull @NonNls String name) {
-    return ! isReserved(name) && IDENTIFIER_PATTERN.matcher(name).matches();
+    return ! isReserved(name) && isIndentifierString(name);
+  }
+
+  public static boolean isIndentifierString(String name) {
+    return IDENTIFIER_PATTERN.matcher(name).matches();
   }
 
   public static boolean isRightOperatorName(@Nullable String name) {

From 01fa4d4e75e634d0b7f6141615a3f11d26ebba5b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 27 Jun 2012 19:21:17 +0200
Subject: [PATCH 3/3] EA-36929 - NFE: PyRequirement.replace

---
 python/src/com/jetbrains/python/packaging/PyRequirement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/packaging/PyRequirement.java b/python/src/com/jetbrains/python/packaging/PyRequirement.java
index 181b4c7e6d28..da00cd36a72e 100644
--- a/python/src/com/jetbrains/python/packaging/PyRequirement.java
+++ b/python/src/com/jetbrains/python/packaging/PyRequirement.java
@@ -153,7 +153,7 @@ public class PyRequirement {
         return null;
       }
       if (s.matches("[0-9]+")) {
-        final int value = Integer.parseInt(s);
+        final long value = Long.parseLong(s);
         return String.format("%08d", value);
       }
       return "*" + s;