merge trunk

3 files changed, 40 insertions, 37 deletions

diff --git a/nova/api/direct.py b/nova/api/direct.py
index 81b3ae202..509ab3ae0 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -196,6 +196,8 @@ class ServiceWrapper(wsgi.Controller):
         # TODO(termie): do some basic normalization on methods
         method = getattr(self.service_handle, action)
 
+        # NOTE(vish): make sure we have no unicode keys for py2.6.
+        params = dict([(str(k), v) for (k, v) in params.iteritems()])
         result = method(context, **params)
         if type(result) is dict or type(result) is list:
             return self._serialize(result, req)
diff --git a/run_tests.sh b/run_tests.sh
index fe703fece..0574643c5 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -31,46 +31,46 @@ always_venv=0
 never_venv=0
 force=0
 noseargs=
-
+wrapper=""
 
 for arg in "$@"; do
   process_option $arg
 done
 
-NOSETESTS="python run_tests.py $noseargs"
-
-if [ $never_venv -eq 1 ]; then
+function run_tests {
   # Just run the test suites in current environment
-  rm -f nova.sqlite
-  $NOSETESTS 2> run_tests.err.log
-  exit
-fi
+  ${wrapper} rm -f nova.sqlite
+  ${wrapper} $NOSETESTS 2> run_tests.err.log
+}
 
-# Remove the virtual environment if --force used
-if [ $force -eq 1 ]; then
-  echo "Cleaning virtualenv..."
-  rm -rf ${venv}
-fi
+NOSETESTS="python run_tests.py $noseargs"
 
-if [ -e ${venv} ]; then
-  ${with_venv} rm -f nova.sqlite
-  ${with_venv} $NOSETESTS 2> run_tests.err.log
-else  
-  if [ $always_venv -eq 1 ]; then
-    # Automatically install the virtualenv
-    python tools/install_venv.py
+if [ $never_venv -eq 0 ]
+then
+  # Remove the virtual environment if --force used
+  if [ $force -eq 1 ]; then
+    echo "Cleaning virtualenv..."
+    rm -rf ${venv}
+  fi
+  if [ -e ${venv} ]; then
+    wrapper="${with_venv}"
   else
-    echo -e "No virtual environment found...create one? (Y/n) \c"
-    read use_ve
-    if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
-      # Install the virtualenv and run the test suite in it
+    if [ $always_venv -eq 1 ]; then
+      # Automatically install the virtualenv
       python tools/install_venv.py
+      wrapper="${with_venv}"
     else
-      rm -f nova.sqlite
-      $NOSETESTS 2> run_tests.err.log
-      exit
+      echo -e "No virtual environment found...create one? (Y/n) \c"
+      read use_ve
+      if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
+        # Install the virtualenv and run the test suite in it
+        python tools/install_venv.py
+		wrapper=${with_venv}
+      fi
     fi
   fi
-  ${with_venv} rm -f nova.sqlite
-  ${with_venv} $NOSETESTS 2> run_tests.err.log
 fi
+
+run_tests
+
+pep8 --repeat --show-pep8 --show-source bin/* nova setup.py
diff --git a/setup.py b/setup.py
index 3608ff805..65adbe992 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ class local_BuildDoc(BuildDoc):
             self.finalize_options()
             BuildDoc.run(self)
 
+
 class local_sdist(sdist):
     """Customized sdist hook - builds the ChangeLog file from VC first"""
 
@@ -57,17 +58,17 @@ class local_sdist(sdist):
                 changelog_file.write(str_dict_replace(changelog, mailmap))
         sdist.run(self)
 
-nova_cmdclass= { 'sdist': local_sdist,
-                 'build_sphinx' : local_BuildDoc }
+nova_cmdclass = {'sdist': local_sdist,
+                 'build_sphinx': local_BuildDoc}
 
 try:
-  from babel.messages import frontend as babel
-  nova_cmdclass['compile_catalog'] = babel.compile_catalog
-  nova_cmdclass['extract_messages'] = babel.extract_messages
-  nova_cmdclass['init_catalog'] = babel.init_catalog
-  nova_cmdclass['update_catalog'] = babel.update_catalog
+    from babel.messages import frontend as babel
+    nova_cmdclass['compile_catalog'] = babel.compile_catalog
+    nova_cmdclass['extract_messages'] = babel.extract_messages
+    nova_cmdclass['init_catalog'] = babel.init_catalog
+    nova_cmdclass['update_catalog'] = babel.update_catalog
 except:
-  pass
+    pass
 
 setup(name='nova',
       version=version.canonical_version_string(),