@@ -85,60 +85,8 @@ function pip_install_gr_extras {

     pip_install $clean_name[$extras]

 }

-# python3_enabled_for() assumes the service(s) specified as arguments are

-# enabled for python 3 unless explicitly disabled. See python3_disabled_for().

-#

-# Multiple services specified as arguments are ``OR``'ed together; the test

-# is a short-circuit boolean, i.e it returns on the first match.

-#

-# python3_enabled_for dir [dir ...]

-function python3_enabled_for {

-    local xtrace

-    xtrace=$(set +o | grep xtrace)

-    set +o xtrace

-

-    local enabled=1

-    local dirs=$@

-    local dir

-    for dir in ${dirs}; do

-        if ! python3_disabled_for "${dir}"; then

-            enabled=0

-        fi

-    done

-

-    $xtrace

-    return $enabled

-}

-

-# python3_disabled_for() checks if the service(s) specified as arguments are

-# disabled by the user in ``DISABLED_PYTHON3_PACKAGES``.

-#

-# Multiple services specified as arguments are ``OR``'ed together; the test

-# is a short-circuit boolean, i.e it returns on the first match.

-#

-# Uses global ``DISABLED_PYTHON3_PACKAGES``

-# python3_disabled_for dir [dir ...]

-function python3_disabled_for {

-    local xtrace

-    xtrace=$(set +o | grep xtrace)

-    set +o xtrace

-

-    local enabled=1

-    local dirs=$@

-    local dir

-    for dir in ${dirs}; do

-        [[ ,${DISABLED_PYTHON3_PACKAGES}, =~ ,${dir}, ]] && enabled=0

-    done

-

-    $xtrace

-    return $enabled

-}

-

 # enable_python3_package() -- no-op for backwards compatibility

 #

-# For example:

-#   enable_python3_package nova

-#

 # enable_python3_package dir [dir ...]

 function enable_python3_package {

     local xtrace

@@ -150,25 +98,15 @@ function enable_python3_package {

     $xtrace

 }

-# disable_python3_package() adds the services passed as argument to

-# the ``DISABLED_PYTHON3_PACKAGES`` list.

-#

-# For example:

-#   disable_python3_package swift

+# disable_python3_package() -- no-op for backwards compatibility

 #

-# Uses global ``DISABLED_PYTHON3_PACKAGES``

 # disable_python3_package dir [dir ...]

 function disable_python3_package {

     local xtrace

     xtrace=$(set +o | grep xtrace)

     set +o xtrace

-    local disabled_svcs="${DISABLED_PYTHON3_PACKAGES}"

-    local dir

-    for dir in $@; do

-        disabled_svcs+=",$dir"

-    done

-    DISABLED_PYTHON3_PACKAGES=$(_cleanup_service_list "$disabled_svcs")

+    echo "It is no longer possible to call disable_python3_package()."

     $xtrace

 }

@@ -231,17 +169,9 @@ function pip_install {

             # support for python3 in progress, but don't claim support

             # in their classifier

             echo "Check python version for : $package_dir"

-            if python3_disabled_for ${package_dir##*/}; then

-                echo "Explicitly using $PYTHON2_VERSION version to install $package_dir based on DISABLED_PYTHON3_PACKAGES"

-            else

-                # For everything that is not explicitly blacklisted with

-                # DISABLED_PYTHON3_PACKAGES, assume it supports python3

-                # and we will let pip sort out the install, regardless of

-                # the package being local or remote.

-                echo "Using $PYTHON3_VERSION version to install $package_dir based on default behavior"

-                sudo_pip="$sudo_pip LC_ALL=en_US.UTF-8"

-                cmd_pip=$(get_pip_command $PYTHON3_VERSION)

-            fi

+            echo "Using $PYTHON3_VERSION version to install $package_dir based on default behavior"

+            sudo_pip="$sudo_pip LC_ALL=en_US.UTF-8"

+            cmd_pip=$(get_pip_command $PYTHON3_VERSION)

         fi

     fi

@@ -138,10 +138,6 @@ fi

 # Control whether Python 3 should be used at all.

 export USE_PYTHON3=$(trueorfalse True USE_PYTHON3)

-# Explicitly list services not to run under Python 3. See

-# disable_python3_package to edit this variable.

-export DISABLED_PYTHON3_PACKAGES=""

-

 # When Python 3 is supported by an application, adding the specific

 # version of Python 3 to this variable will install the app using that

 # version of the interpreter instead of 2.7.

deleted file mode 100755

@@ -1,25 +0,0 @@

-#!/usr/bin/env bash

-

-# Tests for DevStack INI functions

-

-TOP=$(cd $(dirname "$0")/.. && pwd)

-

-source $TOP/functions-common

-source $TOP/inc/python

-

-source $TOP/tests/unittest.sh

-

-echo "Testing Python 3 functions"

-

-# Initialize variables manipulated by functions under test.

-export DISABLED_PYTHON3_PACKAGES=""

-

-assert_true "should be enabled by default" python3_enabled_for testpackage1

-

-assert_false "should not be disabled yet" python3_disabled_for testpackage2

-

-disable_python3_package testpackage2

-assert_equal "$DISABLED_PYTHON3_PACKAGES" "testpackage2"  "unexpected result"

-assert_true "should be disabled" python3_disabled_for testpackage2

-

-report_results