Use unicode(), not str()
Use unicode(), not str()

Unicode errors can occur on unicode input if
str() is used in Python 2.x. Instead, use unicode()
and allow six to provide this for us in Python 3.

Change-Id: I2ad21a2fb367cecad6d6238a1960e92847583f07

Ye-Yong-Chi/nova-docker,mangalaman93/nova-docker,thanhtien522/nova-docker,godvmxi/nova-docker,MinmingQian/nova-docker,Ye-Yong-Chi/nova-docker,thanhtien522/nova-docker,godvmxi/nova-docker,mangalaman93/nova-docker,stackforge/nova-docker,gwdg/nova-docker,harnesscloud/nova-docker,Juniper/nova-docker,msrba/nova-docker,devdattakulkarni/nova-docker-1,Juniper/nova-docker,cloudbase/nova-docker,stackforge/nova-docker,AlphaStaxLLC/nova-docker,gwdg/nova-docker,ggiamarchi/nova-docker,MinmingQian/nova-docker,harnesscloud/nova-docker,ggiamarchi/nova-docker,cloudbase/nova-docker,msrba/nova-docker,AlphaStaxLLC/nova-docker,devdattakulkarni/nova-docker-1