From da906b14a3f04bc858eb541361af86c2dac14f33 Mon Sep 17 00:00:00 2001
From: zhangguoqing <zhang.guoqing@99cloud.net>
Date: Tue, 5 Jan 2016 14:42:52 +0000
Subject: [PATCH] Do not use __builtin__ in python3

__builtin__ does not exist in Python 3, use
six.moves.builtins instead.

Change-Id: I1256f7df641af1085daca1d1ad2c34cb44cda265
closes-bug: #1290234
---
 requirements.txt | 1 +
 test/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 9ba6331..df49472 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@
 # process, which may cause wedges in the gate later.
 
 eventlet>=0.17.4
+six>=1.9.0
diff --git a/test/__init__.py b/test/__init__.py
index f53bc5a..a940b8c 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,6 +1,6 @@
 # See http://code.google.com/p/python-nose/issues/detail?id=373
 # The code below enables nosetests to work with i18n _() blocks
 
-import __builtin__
+import six.moves.builtins as __builtin__
 
 setattr(__builtin__, '_', lambda x: x)