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

[Ali Polatel (hawking)]

hawking     08/10/27 12:23:50

  Modified:             python.eclass
  Log:
  Don't call python_version in python_{en,dis}able_pyc because they may be called in global scope.

Revision  Changes    Path
1.53                 eclass/python.eclass

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

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- python.eclass	27 Oct 2008 00:17:28 -0000	1.52
+++ python.eclass	27 Oct 2008 12:23:50 -0000	1.53
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.52 2008/10/27 00:17:28 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.53 2008/10/27 12:23:50 hawking Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -68,12 +68,8 @@
 # note:   supported by >=dev-lang/python-2.2.3-r3 only.
 #
 python_disable_pyc() {
-	python_version
-	if [[ ${PYVER/./,} -ge 2,6 ]]; then
-		export PYTHONDONTWRITEBYTECODE=1
-	else
-		export PYTHON_DONTCOMPILE=1
-	fi
+	export PYTHONDONTWRITEBYTECODE=1 # For 2.6 and above
+	export PYTHON_DONTCOMPILE=1 # For 2.5 and below
 }
 
 # @FUNCTION: python_enable_pyc
@@ -81,12 +77,8 @@
 # Tells python to automatically recompile modules to .pyc/.pyo if the
 # timestamps/version stamps change
 python_enable_pyc() {
-	python_version
-	if [[ ${PYVER/./,} -ge 2,6 ]]; then
-		unset PYTHONDONTWRITEBYTECODE
-	else
-		unset PYTHON_DONTCOMPILE
-	fi
+	unset PYTHONDONTWRITEBYTECODE
+	unset PYTHON_DONTCOMPILE
 }
 
 python_disable_pyc