From 561e51ff2f7cf35275c0b2e012aad679a03eda09 Mon Sep 17 00:00:00 2001
From: Nic Wolfe <nic@wolfeden.ca>
Date: Mon, 24 Jan 2011 19:07:37 -0700
Subject: [PATCH] Attempted fix for conflicting library imports
---
lib/simplejson/decoder.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/simplejson/decoder.py b/lib/simplejson/decoder.py
index b769ea486..811e73347 100644
--- a/lib/simplejson/decoder.py
+++ b/lib/simplejson/decoder.py
@@ -4,9 +4,9 @@ import re
import sys
import struct
-from simplejson.scanner import make_scanner
+from scanner import make_scanner
try:
- from simplejson._speedups import scanstring as c_scanstring
+ from _speedups import scanstring as c_scanstring
except ImportError:
c_scanstring = None
--
GitLab