From ccd8ba66b27e914fdf8003cc17d0bcafef5bcccb Mon Sep 17 00:00:00 2001
From: Lucas Taylor <ltaylor.volks@gmail.com>
Date: Wed, 27 Mar 2013 17:28:51 -0700
Subject: [PATCH] Display installed packages and versions in Versions panel
 (requires setup tools)

---
 flask_debugtoolbar/panels/versions.py             | 13 ++++---------
 flask_debugtoolbar/templates/panels/versions.html |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/flask_debugtoolbar/panels/versions.py b/flask_debugtoolbar/panels/versions.py
index fda98ac..deefd7a 100644
--- a/flask_debugtoolbar/panels/versions.py
+++ b/flask_debugtoolbar/panels/versions.py
@@ -1,5 +1,4 @@
 from distutils.sysconfig import get_python_lib
-import sys
 
 from flask import __version__ as flask_version
 from flask_debugtoolbar.panels import DebugPanel
@@ -27,17 +26,14 @@ class VersionDebugPanel(DebugPanel):
 
     def content(self):
         try:
-            from yolk import yolklib
+            import pkg_resources
         except ImportError:
-            "Requires yolk to provide package information"
             context = self.context.copy()
             context.update({
-                'packages': [],
-                'paths': sys.path
+                'packages': []
                 })
         else:
-            dist = yolklib.Distributions()
-            active_packages = dist.get_packages('active')
+            active_packages = pkg_resources.WorkingSet()
             _pkgs = dict([(p.project_name, p) for p in active_packages])
             packages = [_pkgs[key] for key in sorted(_pkgs.iterkeys())]
             for package in packages:
@@ -45,8 +41,7 @@ class VersionDebugPanel(DebugPanel):
 
             context = self.context.copy()
             context.update({
-                'packages': packages,
-                'paths': sys.path,
+                'packages': packages
             })
 
         return self.render('panels/versions.html', context)
\ No newline at end of file
diff --git a/flask_debugtoolbar/templates/panels/versions.html b/flask_debugtoolbar/templates/panels/versions.html
index 14fb7f9..38c56f6 100644
--- a/flask_debugtoolbar/templates/panels/versions.html
+++ b/flask_debugtoolbar/templates/panels/versions.html
@@ -18,10 +18,10 @@
             </tr>
         {% else %}
             <tr>
-                <td>yolk</td>
+                <td>setuptools</td>
                 <td>NOT INSTALLED</td>
                 <td>&nbsp;</td>
-                <td>Install Yolk to display installed packages and version information</td>
+                <td>Install setuptools to display installed packages and version information</td>
             </tr>
         {% endfor %}
     </tbody>