From cd37ef0a50dbf89768409bc43dee987c1ee41e38 Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <bryan.tongminh@gmail.com>
Date: Tue, 23 Feb 2010 20:22:37 +0000
Subject: [PATCH] simplejson conflict fix

---
 mwclient/RELEASE-NOTES.txt | 2 ++
 mwclient/__init__.py       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mwclient/RELEASE-NOTES.txt b/mwclient/RELEASE-NOTES.txt
index faa0af6..f922623 100644
--- a/mwclient/RELEASE-NOTES.txt
+++ b/mwclient/RELEASE-NOTES.txt
@@ -10,6 +10,8 @@ Mwclient 0.6.4 is unreleased.
 * Added support for builtin json library
 * Handle badtoken once
 * Bug 2690034: Fix revision iteration
+* Fix module conflict with simplejson-1.x by inserting mwclient path at the 
+  beginning of sys.path instead of the end
 
 == Changes in version 0.6.3 ==
 * Added domain parameter to login.
diff --git a/mwclient/__init__.py b/mwclient/__init__.py
index ef0f6b2..afed317 100644
--- a/mwclient/__init__.py
+++ b/mwclient/__init__.py
@@ -26,7 +26,7 @@
 import sys as _sys
 import os as _os
 _path = _os.path.dirname(__file__)
-_sys.path.append(_os.path.abspath(_path))
+_sys.path.insert(0, _os.path.abspath(_path))
 
 from errors import *
 from client import Site, __ver__
-- 
GitLab