[Python-checkins] python/nondist/sandbox/csv csv.py,1.13,1.14

montanaro@users.sourceforge.net montanaro@users.sourceforge.net
Sun, 02 Feb 2003 18:52:06 -0800


Update of /cvsroot/python/python/nondist/sandbox/csv
In directory sc8-pr-cvs1:/tmp/cvs-serv30005

Modified Files:
	csv.py 
Log Message:
The dialects dict shouldn't be part of the public API.


Index: csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/csv.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** csv.py	3 Feb 2003 02:34:42 -0000	1.13
--- csv.py	3 Feb 2003 02:52:04 -0000	1.14
***************
*** 19,23 ****
      delimiter = '\t'
  
! dialects = {
      'excel': excel(),
      'excel-tab': excel_tab(),
--- 19,23 ----
      delimiter = '\t'
  
! _dialects = {
      'excel': excel(),
      'excel-tab': excel_tab(),
***************
*** 30,34 ****
          else:
              try:
!                 dialect_obj = dialects[dialect]
              except KeyError:
                  raise CSVError('Unknown dialect')
--- 30,34 ----
          else:
              try:
!                 dialect_obj = _dialects[dialect]
              except KeyError:
                  raise CSVError('Unknown dialect')
***************
*** 92,106 ****
      if not issubclass(dialect, Dialect):
          raise TypeError, "dialect not a subclass of Dialect"
!     dialects[name] = dialect()
  
  def get_dialect(name):
!     return dialects[name]
  
  def list_dialects():
!     return dialects.keys()
  
  # An alternate way of populating the dialects dictionary...
  #def _init_dialects():
! #    global dialects
  #    mod = sys.modules[__name__]
  #    for name in dir(mod):
--- 92,106 ----
      if not issubclass(dialect, Dialect):
          raise TypeError, "dialect not a subclass of Dialect"
!     _dialects[name] = dialect()
  
  def get_dialect(name):
!     return _dialects[name]
  
  def list_dialects():
!     return _dialects.keys()
  
  # An alternate way of populating the dialects dictionary...
  #def _init_dialects():
! #    global _dialects
  #    mod = sys.modules[__name__]
  #    for name in dir(mod):
***************
*** 109,113 ****
  #            if issubclass(attr, Dialect) and attr is not Dialect:
  #                dialect = attr()
! #                dialects[dialect.name] = dialect
  #        except TypeError:
  #            pass
--- 109,113 ----
  #            if issubclass(attr, Dialect) and attr is not Dialect:
  #                dialect = attr()
! #                _dialects[dialect.name] = dialect
  #        except TypeError:
  #            pass