diff options
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 11 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 19 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/strategies.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/url.py | 4 |
5 files changed, 20 insertions, 21 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index eab8b3c0b..d3802f306 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -180,8 +180,9 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs): def _coerce_config(configuration, prefix): """Convert configuration values to expected types.""" - options = dict([(key[len(prefix):], configuration[key]) - for key in configuration if key.startswith(prefix)]) + options = dict((key[len(prefix):], configuration[key]) + for key in configuration + if key.startswith(prefix)) for option, type_ in ( ('convert_unicode', bool), ('pool_timeout', int), diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index f356a7c05..6aafafdc1 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1346,8 +1346,8 @@ class RowProxy(object): def __eq__(self, other): return ((other is self) or - (other == tuple([self.__parent._get_col(self.__row, key) - for key in xrange(len(self.__row))]))) + (other == tuple(self.__parent._get_col(self.__row, key) + for key in xrange(len(self.__row))))) def __ne__(self, other): return not self.__eq__(other) @@ -1489,7 +1489,8 @@ class ResultProxy(object): self.__props[o] = rec if self.__echo: - self.context.engine.logger.debug("Col " + repr(tuple([x[0] for x in metadata]))) + self.context.engine.logger.debug( + "Col " + repr(tuple(x[0] for x in metadata))) def _create_key_cache(self): # local copies to avoid circular ref against 'self' @@ -1622,7 +1623,7 @@ class ResultProxy(object): # so we use an exception catch to reduce conditionals in _get_col if isinstance(key, slice): indices = key.indices(len(row)) - return tuple([self._get_col(row, i) for i in xrange(*indices)]) + return tuple(self._get_col(row, i) for i in xrange(*indices)) else: raise @@ -1773,7 +1774,7 @@ class BufferedColumnResultProxy(ResultProxy): # so we use an exception catch to reduce conditionals in _get_col if isinstance(key, slice): indices = key.indices(len(row)) - return tuple([self._get_col(row, i) for i in xrange(*indices)]) + return tuple(self._get_col(row, i) for i in xrange(*indices)) else: raise diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index dcbf8c76f..b68ce0818 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -136,14 +136,12 @@ class DefaultExecutionContext(base.ExecutionContext): # compiled clauseelement. process bind params, process table defaults, # track collections used by ResultProxy to target and process results - self.processors = dict([ + self.processors = dict( (key, value) for key, value in - [( - compiled.bind_names[bindparam], - bindparam.bind_processor(self.dialect) - ) for bindparam in compiled.bind_names] - if value is not None - ]) + ( (compiled.bind_names[bindparam], + bindparam.bind_processor(self.dialect)) + for bindparam in compiled.bind_names ) + if value is not None) self.result_map = compiled.result_map @@ -212,7 +210,7 @@ class DefaultExecutionContext(base.ExecutionContext): # that doesnt specify positional (because of execute_text()) if not isinstance(d, dict): return d - return dict([(k.encode(self.dialect.encoding), d[k]) for k in d]) + return dict((k.encode(self.dialect.encoding), d[k]) for k in d) return [proc(d) for d in params] or [{}] def __convert_compiled_params(self, compiled_parameters): @@ -315,10 +313,9 @@ class DefaultExecutionContext(base.ExecutionContext): from the bind parameter's ``TypeEngine`` objects. """ - types = dict([ + types = dict( (self.compiled.bind_names[bindparam], bindparam.type) - for bindparam in self.compiled.bind_names - ]) + for bindparam in self.compiled.bind_names) if self.dialect.positional: inputsizes = [] diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py index aa595c8e3..c9e65982e 100644 --- a/lib/sqlalchemy/engine/strategies.py +++ b/lib/sqlalchemy/engine/strategies.py @@ -115,7 +115,7 @@ class DefaultEngineStrategy(EngineStrategy): "Invalid argument(s) %s sent to create_engine(), " "using configuration %s/%s/%s. Please check that the " "keyword arguments are appropriate for this combination " - "of components." % (','.join(["'%s'" % k for k in kwargs]), + "of components." % (','.join("'%s'" % k for k in kwargs), dialect.__class__.__name__, pool.__class__.__name__, engineclass.__name__)) diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py index 72d09bf85..b81a91d59 100644 --- a/lib/sqlalchemy/engine/url.py +++ b/lib/sqlalchemy/engine/url.py @@ -72,7 +72,7 @@ class URL(object): if self.query: keys = self.query.keys() keys.sort() - s += '?' + "&".join(["%s=%s" % (k, self.query[k]) for k in keys]) + s += '?' + "&".join("%s=%s" % (k, self.query[k]) for k in keys) return s def __eq__(self, other): @@ -169,7 +169,7 @@ def _parse_rfc1738_args(name): components['database'] = tokens[0] query = (len(tokens) > 1 and dict(cgi.parse_qsl(tokens[1]))) or None if query is not None: - query = dict([(k.encode('ascii'), query[k]) for k in query]) + query = dict((k.encode('ascii'), query[k]) for k in query) else: query = None components['query'] = query |