Merge remote-tracking branch 'origin/master'

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"/>

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) {

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;