[jToolkit-cvs] jToolkit/data dates.py,1.8,1.9 _strptime.py,1.1,1.2

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8247

Modified Files:
	dates.py _strptime.py 
Log Message:
converted to allow importing mxDateTime module directly...



Index: dates.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/data/dates.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dates.py	9 Feb 2004 13:48:20 -0000	1.8
--- dates.py	9 Mar 2004 21:20:57 -0000	1.9
***************
*** 19,23 ****
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
! from DateTime import mxDateTime
  from jToolkit import cidict
  import sre
--- 19,26 ----
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
! try:
!   import mxDateTime
! except ImportError:
!   from DateTime import mxDateTime
  from jToolkit import cidict
  import sre

Index: _strptime.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/data/_strptime.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _strptime.py	25 Sep 2003 18:10:51 -0000	1.1
--- _strptime.py	9 Mar 2004 21:20:57 -0000	1.2
***************
*** 24,28 ****
  except ImportError:
    # compatibility mode for Python 2.2 without datetime module
!   from DateTime import mxDateTime
    class datetime_date:
      fromordinal = mxDateTime.DateTimeFromAbsDays
--- 24,31 ----
  except ImportError:
    # compatibility mode for Python 2.2 without datetime module
!   try:
!     import mxDateTime
!   except ImportError:
!     from DateTime import mxDateTime
    class datetime_date:
      fromordinal = mxDateTime.DateTimeFromAbsDays