Created
January 17, 2014 13:32
-
-
Save yarko/8473409 to your computer and use it in GitHub Desktop.
edx/edx-platform patch file for upgrading from django-debug-toolbar 0.9x to > 1.0x
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/cms/envs/dev.py b/cms/envs/dev.py | |
| index ff9e650..f06b386 100644 | |
| --- a/cms/envs/dev.py | |
| +++ b/cms/envs/dev.py | |
| @@ -165,7 +165,7 @@ DEBUG_TOOLBAR_PANELS = ( | |
| # Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| # hit twice). So you can uncomment when you need to diagnose performance | |
| # problems, but you shouldn't leave it on. | |
| - # 'debug_toolbar.panels.profiling.ProfilingDebugPanel', | |
| + # 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| DEBUG_TOOLBAR_CONFIG = { | |
| diff --git a/cms/envs/dev_dbperf.py b/cms/envs/dev_dbperf.py | |
| index 2ea131b..7a529ce 100644 | |
| --- a/cms/envs/dev_dbperf.py | |
| +++ b/cms/envs/dev_dbperf.py | |
| @@ -9,21 +9,21 @@ This configuration is to turn on the Django Toolbar stats for DB access stats, f | |
| from .dev import * | |
| DEBUG_TOOLBAR_PANELS = ( | |
| - 'debug_toolbar.panels.version.VersionDebugPanel', | |
| - 'debug_toolbar.panels.timer.TimerDebugPanel', | |
| - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', | |
| - 'debug_toolbar.panels.headers.HeaderDebugPanel', | |
| - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', | |
| - 'debug_toolbar.panels.sql.SQLDebugPanel', | |
| - 'debug_toolbar.panels.signals.SignalDebugPanel', | |
| - 'debug_toolbar.panels.logger.LoggingPanel', | |
| - 'debug_toolbar_mongo.panel.MongoDebugPanel' | |
| + 'debug_toolbar.panels.versions.VersionsPanel', | |
| + 'debug_toolbar.panels.timer.TimerPanel', | |
| + 'debug_toolbar.panels.settings.SettingsPanel', | |
| + 'debug_toolbar.panels.headers.HeadersPanel', | |
| + 'debug_toolbar.panels.request.RequestPanel', | |
| + 'debug_toolbar.panels.sql.SQLPanel', | |
| + 'debug_toolbar.panels.signals.SignalsPanel', | |
| + 'debug_toolbar.panels.logging.LoggingPanel', | |
| +# 'debug_toolbar_mongo.panel.MongoDebugPanel' | |
| # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and | |
| # Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| # hit twice). So you can uncomment when you need to diagnose performance | |
| # problems, but you shouldn't leave it on. | |
| - # 'debug_toolbar.panels.profiling.ProfilingDebugPanel', | |
| + # 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| # To see stacktraces for MongoDB queries, set this to True. | |
| diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py | |
| index fa41d5c..fe9d969 100644 | |
| --- a/cms/envs/devstack.py | |
| +++ b/cms/envs/devstack.py | |
| @@ -37,14 +37,20 @@ MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) | |
| INTERNAL_IPS = ('127.0.0.1',) | |
| DEBUG_TOOLBAR_PANELS = ( | |
| - 'debug_toolbar.panels.version.VersionDebugPanel', | |
| - 'debug_toolbar.panels.timer.TimerDebugPanel', | |
| - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', | |
| - 'debug_toolbar.panels.headers.HeaderDebugPanel', | |
| - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', | |
| - 'debug_toolbar.panels.sql.SQLDebugPanel', | |
| - 'debug_toolbar.panels.signals.SignalDebugPanel', | |
| - 'debug_toolbar.panels.logger.LoggingPanel', | |
| + 'debug_toolbar.panels.versions.VersionsPanel', | |
| + 'debug_toolbar.panels.timer.TimerPanel', | |
| + 'debug_toolbar.panels.settings.SettingsPanel', | |
| + 'debug_toolbar.panels.headers.HeadersPanel', | |
| + 'debug_toolbar.panels.request.RequestPanel', | |
| + 'debug_toolbar.panels.sql.SQLPanel', | |
| + 'debug_toolbar.panels.signals.SignalsPanel', | |
| + 'debug_toolbar.panels.logging.LoggingPanel', | |
| + | |
| + # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and | |
| + # Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| + # hit twice). So you can uncomment when you need to diagnose performance | |
| + # problems, but you shouldn't leave it on. | |
| + # 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| DEBUG_TOOLBAR_CONFIG = { | |
| diff --git a/lms/envs/content.py b/lms/envs/content.py | |
| index f85ae0b..7723f4c 100644 | |
| --- a/lms/envs/content.py | |
| +++ b/lms/envs/content.py | |
| @@ -19,18 +19,19 @@ INSTALLED_APPS += ('debug_toolbar',) | |
| MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) | |
| DEBUG_TOOLBAR_PANELS = ( | |
| - 'debug_toolbar.panels.version.VersionDebugPanel', | |
| - 'debug_toolbar.panels.timer.TimerDebugPanel', | |
| - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', | |
| - 'debug_toolbar.panels.headers.HeaderDebugPanel', | |
| - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', | |
| - 'debug_toolbar.panels.sql.SQLDebugPanel', | |
| - 'debug_toolbar.panels.signals.SignalDebugPanel', | |
| - 'debug_toolbar.panels.logger.LoggingPanel', | |
| + 'debug_toolbar.panels.versions.VersionsPanel', | |
| + 'debug_toolbar.panels.timer.TimerPanel', | |
| + 'debug_toolbar.panels.settings.SettingsPanel', | |
| + 'debug_toolbar.panels.headers.HeadersPanel', | |
| + 'debug_toolbar.panels.request.RequestPanel', | |
| + 'debug_toolbar.panels.sql.SQLPanel', | |
| + 'debug_toolbar.panels.signals.SignalsPanel', | |
| + 'debug_toolbar.panels.logging.LoggingPanel', | |
| # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and | |
| # Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| # hit twice). So you can uncomment when you need to diagnose performance | |
| # problems, but you shouldn't leave it on. | |
| -# 'debug_toolbar.panels.profiling.ProfilingDebugPanel', | |
| +# 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| + | |
| diff --git a/lms/envs/dev.py b/lms/envs/dev.py | |
| index 81ff25b..b64e15c 100644 | |
| --- a/lms/envs/dev.py | |
| +++ b/lms/envs/dev.py | |
| @@ -235,7 +235,7 @@ DEBUG_TOOLBAR_PANELS = ( | |
| # Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| # hit twice). So you can uncomment when you need to diagnose performance | |
| # problems, but you shouldn't leave it on. | |
| -# 'debug_toolbar.panels.profiling.ProfilingDebugPanel', | |
| +# 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| DEBUG_TOOLBAR_CONFIG = { | |
| diff --git a/lms/envs/devplus.py b/lms/envs/devplus.py | |
| index adda94f..8ab60a3 100644 | |
| --- a/lms/envs/devplus.py | |
| +++ b/lms/envs/devplus.py | |
| @@ -57,20 +57,20 @@ MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) | |
| INTERNAL_IPS = ('127.0.0.1',) | |
| DEBUG_TOOLBAR_PANELS = ( | |
| - 'debug_toolbar.panels.version.VersionDebugPanel', | |
| - 'debug_toolbar.panels.timer.TimerDebugPanel', | |
| - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', | |
| - 'debug_toolbar.panels.headers.HeaderDebugPanel', | |
| - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', | |
| - 'debug_toolbar.panels.sql.SQLDebugPanel', | |
| - 'debug_toolbar.panels.signals.SignalDebugPanel', | |
| - 'debug_toolbar.panels.logger.LoggingPanel', | |
| + 'debug_toolbar.panels.versions.VersionsPanel', | |
| + 'debug_toolbar.panels.timer.TimerPanel', | |
| + 'debug_toolbar.panels.settings.SettingsPanel', | |
| + 'debug_toolbar.panels.headers.HeadersPanel', | |
| + 'debug_toolbar.panels.request.RequestPanel', | |
| + 'debug_toolbar.panels.sql.SQLPanel', | |
| + 'debug_toolbar.panels.signals.SignalsPanel', | |
| + 'debug_toolbar.panels.logging.LoggingPanel', | |
| # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and | |
| # Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| # hit twice). So you can uncomment when you need to diagnose performance | |
| # problems, but you shouldn't leave it on. | |
| - 'debug_toolbar.panels.profiling.ProfilingDebugPanel', | |
| + 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| #PIPELINE = True | |
| diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py | |
| index adec04b..d67c16c 100644 | |
| --- a/lms/envs/devstack.py | |
| +++ b/lms/envs/devstack.py | |
| @@ -35,14 +35,20 @@ MIDDLEWARE_CLASSES += ('django_comment_client.utils.QueryCountDebugMiddleware', | |
| INTERNAL_IPS = ('127.0.0.1',) | |
| DEBUG_TOOLBAR_PANELS = ( | |
| - 'debug_toolbar.panels.version.VersionDebugPanel', | |
| - 'debug_toolbar.panels.timer.TimerDebugPanel', | |
| - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', | |
| - 'debug_toolbar.panels.headers.HeaderDebugPanel', | |
| - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', | |
| - 'debug_toolbar.panels.sql.SQLDebugPanel', | |
| - 'debug_toolbar.panels.signals.SignalDebugPanel', | |
| - 'debug_toolbar.panels.logger.LoggingPanel', | |
| + 'debug_toolbar.panels.versions.VersionsPanel', | |
| + 'debug_toolbar.panels.timer.TimerPanel', | |
| + 'debug_toolbar.panels.settings.SettingsPanel', | |
| + 'debug_toolbar.panels.headers.HeadersPanel', | |
| + 'debug_toolbar.panels.request.RequestPanel', | |
| + 'debug_toolbar.panels.sql.SQLPanel', | |
| + 'debug_toolbar.panels.signals.SignalsPanel', | |
| + 'debug_toolbar.panels.logging.LoggingPanel', | |
| + | |
| +# Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and | |
| +# Django=1.3.1/1.4 where requests to views get duplicated (your method gets | |
| +# hit twice). So you can uncomment when you need to diagnose performance | |
| +# problems, but you shouldn't leave it on. | |
| +# 'debug_toolbar.panels.profiling.ProfilingPanel', | |
| ) | |
| DEBUG_TOOLBAR_CONFIG = { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment