[gnue] r7281 - in trunk/gnue-common: . module/base src/apps

[reinhard]

Author: reinhard
Date: 2005-03-31 15:39:54 -0600 (Thu, 31 Mar 2005)
New Revision: 7281

Modified:
   trunk/gnue-common/module/base/__init__.py
   trunk/gnue-common/setup.py
   trunk/gnue-common/src/apps/GBaseApp.py
   trunk/gnue-common/src/apps/__init__.py
Log:
Require Python 2.3. This is a small step for a man, but a giant leap for GNUe.


Modified: trunk/gnue-common/module/base/__init__.py
===================================================================
--- trunk/gnue-common/module/base/__init__.py   2005-03-30 07:08:05 UTC (rev 
7280)
+++ trunk/gnue-common/module/base/__init__.py   2005-03-31 21:39:54 UTC (rev 
7281)
@@ -1,6 +1,9 @@
+# GNU Enterprise Common Library - Base Module
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2005 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,19 +19,13 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# __init__.py
-#
-# DESCRIPTION:
+# $Id$
+
 """
-GNUe base module.  All gnue.* modules depend on gnue.common, so import 
gnue.<whatever>" will cause gnue.common.apps to be loaded. This sets up a GNUe 
environment.
+GNUe base module.  All gnue.* modules depend on gnue.common, so import
+gnue.<whatever>" will cause gnue.common.apps to be loaded. This sets up a GNUe
+environment.
 """
-#
-# NOTES:
-#
 
-
-# Init stuff like _() and True/False (for python <2.2)
+# Init stuff like _()
 import gnue.common.apps as _init


Property changes on: trunk/gnue-common/module/base/__init__.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-common/setup.py
===================================================================
--- trunk/gnue-common/setup.py  2005-03-30 07:08:05 UTC (rev 7280)
+++ trunk/gnue-common/setup.py  2005-03-31 21:39:54 UTC (rev 7281)
@@ -184,19 +184,19 @@
 # -----------------------------------------------------------------------------
 
 try:
-  if sys.hexversion < 0x02000000:
+  if sys.hexversion < 0x02030000:
     raise AttributeError
 except AttributeError:
   print "-" * 70
   print """
   You are running Python %s.
 
-  GNU Enterprise requires at least Python 2.0 (recommended: 2.1+).
+  GNU Enterprise requires at least Python 2.3.
   If you have a later version installed, you should run setup.py
-  against that version. For example, if you have Python 2.2
+  against that version. For example, if you have Python 2.3
   installed, you may need to run:
 
-       python2.2 setup.py
+       python2.3 setup.py
 """ % string.split(sys.version)[0]
   print "-" * 70
   sys.exit (1)

Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py      2005-03-30 07:08:05 UTC (rev 
7280)
+++ trunk/gnue-common/src/apps/GBaseApp.py      2005-03-31 21:39:54 UTC (rev 
7281)
@@ -192,10 +192,10 @@
              os.path.join (paths.config, "connections.conf")) ]
 
     # Python version check
-    if not hasattr (sys, 'hexversion') or sys.hexversion < 0x02010000:
-      msg = _("This application requires Python 2.1 or greater.")
+    if not hasattr (sys, 'hexversion') or sys.hexversion < 0x02030000:
+      msg = u_("This application requires Python 2.3 or greater.")
       if hasattr (sys, 'version'):
-        msg = u_("This application requires Python 2.1 or greater. "
+        msg = u_("This application requires Python 2.3 or greater. "
                  "You are running Python %s") % sys.version [:5]
 
       raise errors.AdminError, msg

Modified: trunk/gnue-common/src/apps/__init__.py
===================================================================
--- trunk/gnue-common/src/apps/__init__.py      2005-03-30 07:08:05 UTC (rev 
7280)
+++ trunk/gnue-common/src/apps/__init__.py      2005-03-31 21:39:54 UTC (rev 
7281)
@@ -25,18 +25,6 @@
 Basic services for all GNUe based applications
 """
 
-# Python 2.2 introduced True/False types
-# For Python 2.0/2.1, we add them ourselves
-import sys
-if sys.hexversion < 0x02020000:
-  __builtins__['True']  = 1
-  __builtins__['False'] = 0
-
-# Add "basestring" for Python 2.2 or less
-if sys.hexversion < 0x02030000:
-  __builtins__['basestring'] = type("")
-
-
 # These modules introduce new functions into the builtins dictionary, so we
 # always import them
 import GDebug