Merge "Synchronize code from oslo"

keystoneclient/openstack/common/timeutils.py

@@ -49,9 +49,9 @@ def parse_isotime(timestr):
     try:
         return iso8601.parse_date(timestr)
     except iso8601.ParseError as e:
-        raise ValueError(e.message)
+        raise ValueError(unicode(e))
     except TypeError as e:
-        raise ValueError(e.message)
+        raise ValueError(unicode(e))
 
 
 def strtime(at=None, fmt=PERFECT_TIME_FORMAT):

tools/install_venv_common.py

@@ -114,9 +114,10 @@ class InstallVenv(object):
         print('Installing dependencies with pip (this can take a while)...')
 
         # First things first, make sure our venv has the latest pip and
-        # setuptools.
-        self.pip_install('pip>=1.3')
+        # setuptools and pbr
+        self.pip_install('pip>=1.4')
         self.pip_install('setuptools')
+        self.pip_install('pbr')
 
         self.pip_install('-r', self.requirements)
         self.pip_install('-r', self.test_requirements)
@@ -201,6 +202,7 @@ class Fedora(Distro):
         RHEL: https://bugzilla.redhat.com/958868
         """
 
+        if os.path.exists('contrib/redhat-eventlet.patch'):
             # Install "patch" program if it's not there
             if not self.check_pkg('patch'):
                 self.die("Please install 'patch'.")