[gentoo-commits] gentoo-x86 commit in eclass: python.eclass

["Petteri Raty (betelgeuse)" <betelgeuse@gentoo.org>]

betelgeuse    10/03/12 18:27:01

  Modified:             python.eclass
  Log:
  Using terminal colors to modify eerror output is not allowed. Switch to using einfo for deprecated functions so that they don't get logged by default for users.

Revision  Changes    Path
1.93                 eclass/python.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.92&r2=1.93

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- python.eclass	4 Mar 2010 17:42:11 -0000	1.92
+++ python.eclass	12 Mar 2010 18:27:01 -0000	1.93
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.92 2010/03/04 17:42:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.93 2010/03/12 18:27:01 betelgeuse Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -2025,13 +2025,11 @@
 		die "${FUNCNAME}() cannot be used in this EAPI"
 	fi
 
-	_python_set_color_variables
-
 	if [[ "${FUNCNAME[1]}" != "distutils_python_version" ]]; then
-		eerror
-		eerror "${_RED}Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01.${_NORMAL}"
-		eerror "${_RED}Use PYTHON() instead of python variable. Use python_get_*() instead of PYVER* variables.${_NORMAL}"
-		eerror
+		einfo
+		einfo "Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01."
+		einfo "Use PYTHON() instead of python variable. Use python_get_*() instead of PYVER* variables."
+		einfo
 	fi
 
 	[[ -n "${PYVER}" ]] && return 0
@@ -2065,12 +2063,10 @@
 		die "${FUNCNAME}() cannot be used in this EAPI"
 	fi
 
-	_python_set_color_variables
-
-	eerror
-	eerror "${_RED}Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01.${_NORMAL}"
-	eerror "${_RED}Use USE dependencies and/or has_version() instead of ${FUNCNAME}().${_NORMAL}"
-	eerror
+	einfo
+	einfo "Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01."
+	einfo "Use USE dependencies and/or has_version() instead of ${FUNCNAME}()."
+	einfo
 
 	if [[ "$#" -ne 1 ]]; then
 		die "${FUNCNAME}() requires 1 argument"
@@ -2088,13 +2084,11 @@
 		die "${FUNCNAME}() cannot be used in this EAPI"
 	fi
 
-	_python_set_color_variables
-
 	if [[ "${FUNCNAME[1]}" != "distutils_python_tkinter" ]]; then
-		eerror
-		eerror "${_RED}Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01.${_NORMAL}"
-		eerror "${_RED}Use PYTHON_USE_WITH=\"xml\" and python_pkg_setup() instead of ${FUNCNAME}().${_NORMAL}"
-		eerror
+		einfo
+		einfo "Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01."
+		einfo "Use PYTHON_USE_WITH=\"xml\" and python_pkg_setup() instead of ${FUNCNAME}()."
+		einfo
 	fi
 
 	if ! "$(PYTHON ${PYTHON_ABI})" -c "from sys import version_info