separate Python and Django live template providers

python/src/META-INF/python-plugin-common.xml

@@ -684,6 +684,8 @@
     <findUsagesHandlerFactory implementation="com.jetbrains.django.refactoring.DjangoFindUsagesHandlerFactory"/>
     <referencesSearch implementation="com.jetbrains.django.refactoring.DjangoParameterReferenceSearcher"/>
 
+    <defaultLiveTemplatesProvider implementation="com.jetbrains.django.DjangoDefaultLiveTemplatesProvider"/>
+  </
     <!-- App Engine -->
     <facetType implementation="com.jetbrains.appengine.facet.AppEngineFacetType"/>
     <framework.detector implementation="com.jetbrains.appengine.facet.AppEngineFrameworkDetector"/>
@@ -875,7 +877,7 @@
     <highlightRangeExtension implementation="com.jetbrains.pyramid.templates.highlighting.ChameleonAnnotatingVisitor"/>
     <annotator language="Chameleon" implementationClass="com.jetbrains.pyramid.templates.highlighting.ChameleonAnnotatingVisitor"/>
     <xml.xmlExtension implementation="com.jetbrains.pyramid.templates.highlighting.ChameleonXmlExtension" order="first"/>
-  </extensions>
+    extensions>
 
   <extensionPoints>
     <extensionPoint qualifiedName="Pythonid.importResolver" interface="com.jetbrains.python.psi.impl.PyImportResolver"/>

python/src/com/jetbrains/python/codeInsight/liveTemplates/PyDefaultLiveTemplatesProvider.java

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NonNls;
  */
 public class PyDefaultLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
   private static final @NonNls String[] DEFAULT_TEMPLATES = new String[]{
-    "/liveTemplates/Django", "/liveTemplates/Python"
+    "/liveTemplates/Python"
   };
 
   public String[] getDefaultLiveTemplateFiles() {