Merge remote branch 'origin/master'

python/helpers/pydev/pydev_log.py

@@ -1,30 +1,18 @@
-import logging
 import os
 import sys
 from pydevd_constants import DebugInfoHolder
 
-logger = logging.getLogger('pydev')
-#hdlr = logging.FileHandler('/var/tmp/pycharm-debug-%d.log'%os.getpid())
-#formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-#hdlr.setFormatter(formatter)
-#logger.addHandler(hdlr)
-logger.setLevel(logging.DEBUG)
-
 def debug(message):
-    logger.debug(message)
     if DebugInfoHolder.DEBUG_TRACE_LEVEL>2:
         sys.stderr.write(message)
 
 def warn(message):
-    logger.warn(message)
     if DebugInfoHolder.DEBUG_TRACE_LEVEL>1:
         sys.stderr.write(message)
 
 def info(message):
-    logger.info(message)
     sys.stderr.write(message)
 
 def error(message):
-    logger.error(message)
     sys.stderr.write(message)
 

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

@@ -526,6 +526,7 @@
                     implementationClass="com.jetbrains.django.lang.template.formatter.DjangoTemplateFormattingModelBuilder"/>
 
     <xml.zenCodingGenerator implementation="com.jetbrains.django.lang.template.DjangoTemplateZenCodingGenerator"/>
+
     <xml.elementDescriptorProvider implementation="com.jetbrains.django.lang.template.DjangoTemplateDescriptorProvider"/>
 
     <completion.contributor language="DjangoTemplate"