From 166169d711012cfbe91314005cee21d2b9d79b99 Mon Sep 17 00:00:00 2001
From: David Raila <raila@illinois.edu>
Date: Mon, 15 Sep 2008 17:58:05 +0000
Subject: [PATCH] Add code suggested by Michal Januszewski <michalj@gmail.com>
 to ensure that Python tests run correctly even when a previous version of the
 library is already installed.  I was unable to reproduce his problem on my
 machine but the fix seems harmless enough.

---
 python/setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/python/setup.py b/python/setup.py
index 638ee27..44d0f39 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -47,6 +47,11 @@ def generate_proto(source):
       sys.exit(-1)
 
 def MakeTestSuite():
+  # This is apparently needed on some systems to make sure that the tests
+  # work even if a previous version is already installed.
+  if 'google' in sys.modules:
+    del sys.modules['google']
+
   generate_proto("../src/google/protobuf/unittest.proto")
   generate_proto("../src/google/protobuf/unittest_import.proto")
   generate_proto("../src/google/protobuf/unittest_mset.proto")
-- 
GitLab