From c4bc8b21d203668645ab551318aef5859e3acb9e Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 11 Oct 2014 15:42:24 -0700
Subject: Fix VersionConflict test failure

Fixes `TypeError: 'NoneType' object is not iterable` error at pkg_resources.py:632

Fixes issue #270

--HG--
branch : BB-270_fix_VersionConflict_test_failure_2
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index de50c4b0..511068a6 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -628,7 +628,7 @@ class WorkingSet(object):
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
                 tmpl = "%s is installed but %s is required by %s"
-                args = dist, req, list(required_by.get(req))
+                args = dist, req, list(required_by.get(req, []))
                 raise VersionConflict(tmpl % args)
 
             # push the new requirements onto the stack
-- 
cgit v1.2.3