Remove basestring, unicode from code base

Browse Source
This commit is contained in:
Stefan Wehrmeyer 2013-12-18 04:05:23 +01:00
parent b3520665d7
commit 88c0c1a15f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dataset/persistence/table.py
View File

@ -118,9 +118,8 @@ class Table(object):
``types``, matching the behavior of :py:meth:`insert() <dataset.Table.insert>`. ``types``, matching the behavior of :py:meth:`insert() <dataset.Table.insert>`.
""" """
# check whether keys arg is a string and format as a list # check whether keys arg is a string and format as a list
if isinstance(keys, basestring): if not isinstance(keys, (list, tuple)):
keys = [keys] keys = [keys]
self._check_dropped() self._check_dropped()
if not keys or len(keys)==len(row): if not keys or len(keys)==len(row):
return False return False
@ -153,9 +152,8 @@ class Table(object):
table.upsert(data, ['id']) table.upsert(data, ['id'])
""" """
# check whether keys arg is a string and format as a list # check whether keys arg is a string and format as a list
if isinstance(keys, basestring): if not isinstance(keys, (list, tuple)):
keys = [keys] keys = [keys]
self._check_dropped() self._check_dropped()
if ensure: if ensure:
self.create_index(keys) self.create_index(keys)
@ -317,7 +315,7 @@ class Table(object):
For more complex queries, please use :py:meth:`db.query() <dataset.Database.query>` For more complex queries, please use :py:meth:`db.query() <dataset.Database.query>`
instead.""" instead."""
self._check_dropped() self._check_dropped()
if isinstance(order_by, (str, unicode)): if not isinstance(order_by, (list, tuple)):
order_by = [order_by] order_by = [order_by]
order_by = filter(lambda o: o in self.table.columns, order_by) order_by = filter(lambda o: o in self.table.columns, order_by)
order_by = [self._args_to_order_by(o) for o in order_by] order_by = [self._args_to_order_by(o) for o in order_by]