Merge "Run keystone server in debug mode."

2013-03-11 14:13:32 +00:00 · 2013-03-11 14:13:32 +00:00 · 7052bffe2b
commit 7052bffe2b
parent caab11d405 6308bf1c71
1 changed files with 4 additions and 1 deletions
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@ -221,7 +221,10 @@ def setup_remote_pydev_debug():
                     'that a debugger processes is listening on that port.')

        try:
-            from pydev import pydevd
+            try:
+                from pydevd import pydevd
+            except ImportError:
+                import pydevd

            pydevd.settrace(CONF.pydev_debug_host,
                            port=CONF.pydev_debug_port,