From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 6 Apr 2015 08:51:49 +0000 (+0000)
Subject: Merge "Use six.text_type instead of unicode"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=81e92762ae8291919c944f4e2ad24e492d0fd658;p=openstack-build%2Fcinder-build.git

Merge "Use six.text_type instead of unicode"
---

81e92762ae8291919c944f4e2ad24e492d0fd658
diff --cc cinder/backup/manager.py
index 0f8eaa5e1,8bdde3852..73756fb90
--- a/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@@ -626,10 -628,10 +627,10 @@@ class BackupManager(manager.SchedulerDe
                      self.db.backup_update(context, backup_id,
                                            {'status': 'error',
                                             'fail_reason':
-                                            unicode(err)})
+                                            six.text_type(err)})
  
              LOG.info(_LI('Import record id %s metadata from driver '
 -                         'finished.') % backup_id)
 +                         'finished.'), backup_id)
  
      def reset_status(self, context, backup_id, status):
          """Reset volume backup status.