From d9d85defd39e54c52d263e8caf77de0a0f37246e Mon Sep 17 00:00:00 2001
From: Nic Wolfe <nic@wolfeden.ca>
Date: Fri, 28 Jan 2011 09:17:53 -0700
Subject: [PATCH] Fix an import conflict with simplejson
---
lib/simplejson/scanner.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/simplejson/scanner.py b/lib/simplejson/scanner.py
index adbc6ec97..866edc045 100644
--- a/lib/simplejson/scanner.py
+++ b/lib/simplejson/scanner.py
@@ -2,7 +2,7 @@
"""
import re
try:
- from simplejson._speedups import make_scanner as c_make_scanner
+ from lib.simplejson._speedups import make_scanner as c_make_scanner
except ImportError:
c_make_scanner = None
--
GitLab