[Python-checkins] python/dist/src/Lib csv.py,1.12,1.13
andrewmcnamara at users.sourceforge.net
andrewmcnamara at users.sourceforge.net
Tue Jan 11 03:23:20 CET 2005
Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26712/Lib
Modified Files:
csv.py
Log Message:
Replace python-coded validation of csv dialect with a call to the C
dialect type (which has a better idea of what is and isn't valid).
Index: csv.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/csv.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- csv.py 7 Jan 2005 04:42:45 -0000 1.12
+++ csv.py 11 Jan 2005 02:22:46 -0000 1.13
@@ -8,6 +8,7 @@
unregister_dialect, get_dialect, list_dialects, \
QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONNUMERIC, QUOTE_NONE, \
__doc__
+from _csv import Dialect as _Dialect
try:
from cStringIO import StringIO
@@ -41,48 +42,14 @@
def __init__(self):
if self.__class__ != Dialect:
self._valid = True
- errors = self._validate()
- if errors != []:
- raise Error, "Dialect did not validate: %s" % ", ".join(errors)
+ self._validate()
def _validate(self):
- errors = []
- if not self._valid:
- errors.append("can't directly instantiate Dialect class")
-
- if self.delimiter is None:
- errors.append("delimiter character not set")
- elif (not isinstance(self.delimiter, str) or
- len(self.delimiter) > 1):
- errors.append("delimiter must be one-character string")
-
- if self.quotechar is None:
- if self.quoting != QUOTE_NONE:
- errors.append("quotechar not set")
- elif (not isinstance(self.quotechar, str) or
- len(self.quotechar) > 1):
- errors.append("quotechar must be one-character string")
-
- if self.lineterminator is None:
- errors.append("lineterminator not set")
- elif not isinstance(self.lineterminator, str):
- errors.append("lineterminator must be a string")
-
- if self.doublequote not in (True, False) and self.quoting != QUOTE_NONE:
- errors.append("doublequote parameter must be True or False")
-
- if self.skipinitialspace not in (True, False):
- errors.append("skipinitialspace parameter must be True or False")
-
- if self.quoting is None:
- errors.append("quoting parameter not set")
-
- if self.quoting is QUOTE_NONE:
- if (not isinstance(self.escapechar, (unicode, str)) or
- len(self.escapechar) > 1):
- errors.append("escapechar must be a one-character string or unicode object")
-
- return errors
+ try:
+ _Dialect(self)
+ except TypeError, e:
+ # We do this for compatibility with py2.3
+ raise Error(str(e))
class excel(Dialect):
"""Describe the usual properties of Excel-generated CSV files."""
More information about the Python-checkins
mailing list