[Python-checkins] python/dist/src/Tools/scripts pickle2db.py,1.1,1.2

[montanaro@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv21767

Modified Files:
	pickle2db.py 
Log Message:
try to avoid gross incompatibilities with earlier versions of Python


Index: pickle2db.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pickle2db.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pickle2db.py	3 Feb 2003 15:08:42 -0000	1.1
--- pickle2db.py	3 Feb 2003 15:28:23 -0000	1.2
***************
*** 38,42 ****
  
  def usage():
!    print >> sys.stderr, __doc__ % globals()
  
  def main(args):
--- 38,42 ----
  
  def usage():
!    sys.stderr.write(__doc__ % globals())
  
  def main(args):
***************
*** 57,63 ****
          dbfile = args[0]
          try:
!             pfile = file(args[1], 'rb')
          except IOError:
!             print >> sys.stderr, "Unable to open", args[1]
              return 1
  
--- 57,63 ----
          dbfile = args[0]
          try:
!             pfile = open(args[1], 'rb')
          except IOError:
!             sys.stderr.write("Unable to open %s\n" % args[1])
              return 1
  
***************
*** 68,72 ****
                  dbopen = bsddb.hashopen
              except AttributeError:
!                 print >> sys.stderr, "bsddb module unavailable."
                  return 1
          elif opt in ("-b", "--btree"):
--- 68,72 ----
                  dbopen = bsddb.hashopen
              except AttributeError:
!                 sys.stderr.write("bsddb module unavailable.\n")
                  return 1
          elif opt in ("-b", "--btree"):
***************
*** 74,78 ****
                  dbopen = bsddb.btopen
              except AttributeError:
!                 print >> sys.stderr, "bsddb module unavailable."
                  return 1
          elif opt in ("-r", "--recno"):
--- 74,78 ----
                  dbopen = bsddb.btopen
              except AttributeError:
!                 sys.stderr.write("bsddb module unavailable.\n")
                  return 1
          elif opt in ("-r", "--recno"):
***************
*** 80,84 ****
                  dbopen = bsddb.rnopen
              except AttributeError:
!                 print >> sys.stderr, "bsddb module unavailable."
                  return 1
          elif opt in ("-a", "--anydbm"):
--- 80,84 ----
                  dbopen = bsddb.rnopen
              except AttributeError:
!                 sys.stderr.write("bsddb module unavailable.\n")
                  return 1
          elif opt in ("-a", "--anydbm"):
***************
*** 86,90 ****
                  dbopen = anydbm.open
              except AttributeError:
!                 print >> sys.stderr, "anydbm module unavailable."
                  return 1
          elif opt in ("-d", "--dbm"):
--- 86,90 ----
                  dbopen = anydbm.open
              except AttributeError:
!                 sys.stderr.write("anydbm module unavailable.\n")
                  return 1
          elif opt in ("-d", "--dbm"):
***************
*** 92,101 ****
                  dbopen = dbm.open
              except AttributeError:
!                 print >> sys.stderr, "dbm module unavailable."
                  return 1
      if dbopen is None:
          if bsddb is None:
!             print >> sys.stderr, "bsddb module unavailable -"
!             print >> sys.stderr, "must specify dbtype."
              return 1
          else:
--- 92,101 ----
                  dbopen = dbm.open
              except AttributeError:
!                 sys.stderr.write("dbm module unavailable.\n")
                  return 1
      if dbopen is None:
          if bsddb is None:
!             sys.stderr.write("bsddb module unavailable - ")
!             sys.stderr.write("must specify dbtype.\n")
              return 1
          else:
***************
*** 105,110 ****
          db = dbopen(dbfile, 'c')
      except bsddb.error:
!         print >> sys.stderr, "Unable to open", dbfile,
!         print >> sys.stderr, "Check for format or version mismatch."
          return 1
      else:
--- 105,110 ----
          db = dbopen(dbfile, 'c')
      except bsddb.error:
!         sys.stderr.write("Unable to open %s.  " % dbfile)
!         sys.stderr.write("Check for format or version mismatch.\n")
          return 1
      else: