<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/python-packages/sqlalchemy.git/lib/sqlalchemy/orm/identity.py, branch rel_0_9</title>
<subtitle>github.com: zzzeek/sqlalchemy.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/'/>
<entry>
<title>- use consistent and descriptive language in all cases</title>
<updated>2015-08-28T03:40:13+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2015-08-28T03:38:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=6192af397f0fb5d8fc1029296d5c7c8a4cbbbc11'/>
<id>6192af397f0fb5d8fc1029296d5c7c8a4cbbbc11</id>
<content type='text'>
where we refer to the "weak_identity_map" option, and add additional
exposition in the session documentation which refers to it.
fixes #3517

(cherry picked from commit 956907a4b15f6dcc492582a7ad03706ff62d96fb)

Conflicts:
	lib/sqlalchemy/orm/identity.py
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
where we refer to the "weak_identity_map" option, and add additional
exposition in the session documentation which refers to it.
fixes #3517

(cherry picked from commit 956907a4b15f6dcc492582a7ad03706ff62d96fb)

Conflicts:
	lib/sqlalchemy/orm/identity.py
</pre>
</div>
</content>
</entry>
<entry>
<title>- copyright 2015</title>
<updated>2015-03-10T19:27:20+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2015-03-10T19:27:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=c3c889d8826062a3efe19d28094c11ecc1313b3f'/>
<id>c3c889d8826062a3efe19d28094c11ecc1313b3f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>- apply pep8 formatting to sqlalchemy/sql, sqlalchemy/util, sqlalchemy/dialects,</title>
<updated>2014-07-20T17:11:41+00:00</updated>
<author>
<name>Brian Jarrett</name>
<email>celttechie@gmail.com</email>
</author>
<published>2014-07-20T16:44:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=6b49e8c7c7fb0ff9329d50ec95d38facf062cfb8'/>
<id>6b49e8c7c7fb0ff9329d50ec95d38facf062cfb8</id>
<content type='text'>
sqlalchemy/orm, sqlalchemy/event, sqlalchemy/testing

Conflicts:
	lib/sqlalchemy/dialects/mssql/base.py
	lib/sqlalchemy/dialects/mysql/base.py
	lib/sqlalchemy/dialects/mysql/mysqldb.py
	lib/sqlalchemy/dialects/oracle/base.py
	lib/sqlalchemy/dialects/sybase/base.py
	lib/sqlalchemy/orm/attributes.py
	lib/sqlalchemy/orm/evaluator.py
	lib/sqlalchemy/orm/identity.py
	lib/sqlalchemy/orm/instrumentation.py
	lib/sqlalchemy/orm/loading.py
	lib/sqlalchemy/orm/mapper.py
	lib/sqlalchemy/orm/session.py
	lib/sqlalchemy/orm/sync.py
	lib/sqlalchemy/sql/compiler.py
	lib/sqlalchemy/sql/selectable.py
	lib/sqlalchemy/testing/requirements.py
	lib/sqlalchemy/testing/suite/test_select.py
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
sqlalchemy/orm, sqlalchemy/event, sqlalchemy/testing

Conflicts:
	lib/sqlalchemy/dialects/mssql/base.py
	lib/sqlalchemy/dialects/mysql/base.py
	lib/sqlalchemy/dialects/mysql/mysqldb.py
	lib/sqlalchemy/dialects/oracle/base.py
	lib/sqlalchemy/dialects/sybase/base.py
	lib/sqlalchemy/orm/attributes.py
	lib/sqlalchemy/orm/evaluator.py
	lib/sqlalchemy/orm/identity.py
	lib/sqlalchemy/orm/instrumentation.py
	lib/sqlalchemy/orm/loading.py
	lib/sqlalchemy/orm/mapper.py
	lib/sqlalchemy/orm/session.py
	lib/sqlalchemy/orm/sync.py
	lib/sqlalchemy/sql/compiler.py
	lib/sqlalchemy/sql/selectable.py
	lib/sqlalchemy/testing/requirements.py
	lib/sqlalchemy/testing/suite/test_select.py
</pre>
</div>
</content>
</entry>
<entry>
<title>- break up the &lt;authors&gt; copyright comment as part of a pass</title>
<updated>2014-07-09T22:29:17+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2014-07-09T22:29:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=723d118ef1c4fbb6d1a81513dd6d50521081d86a'/>
<id>723d118ef1c4fbb6d1a81513dd6d50521081d86a</id>
<content type='text'>
  to get all flake8 passing
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
  to get all flake8 passing
</pre>
</div>
</content>
</entry>
<entry>
<title>- happy new year</title>
<updated>2014-01-05T21:57:05+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2014-01-05T21:57:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=f89d4d216bd7605c920b7b8a10ecde6bfea2238c'/>
<id>f89d4d216bd7605c920b7b8a10ecde6bfea2238c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>- spot checking of imports, obsolete functions</title>
<updated>2013-08-17T16:14:58+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2013-08-17T16:14:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=2038837fa4c03c6da4b6d4c389fd062abc4e844c'/>
<id>2038837fa4c03c6da4b6d4c389fd062abc4e844c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>clean up some of this collection stuff</title>
<updated>2013-05-27T00:17:22+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2013-05-27T00:17:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=6abd0c4eac69ba9ca3530a9e5076d57a5b42b998'/>
<id>6abd0c4eac69ba9ca3530a9e5076d57a5b42b998</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>do a sweep of some obvious 3kisms</title>
<updated>2013-05-26T22:23:26+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2013-05-26T22:23:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=61c796786cb222cfdca611395d8550973fc3f8d5'/>
<id>61c796786cb222cfdca611395d8550973fc3f8d5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>- the raw 2to3 run</title>
<updated>2013-04-27T23:53:57+00:00</updated>
<author>
<name>Mike Bayer</name>
<email>mike_mp@zzzcomputing.com</email>
</author>
<published>2013-04-27T23:53:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=4b614b9b35cd2baddb7ca67c04bee5d70ec6a172'/>
<id>4b614b9b35cd2baddb7ca67c04bee5d70ec6a172</id>
<content type='text'>
- went through examples/ and cleaned out excess list() calls
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- went through examples/ and cleaned out excess list() calls
</pre>
</div>
</content>
</entry>
<entry>
<title>happy new year (see #2645)</title>
<updated>2013-01-01T18:46:21+00:00</updated>
<author>
<name>Diana Clarke</name>
<email>diana.joan.clarke@gmail.com</email>
</author>
<published>2013-01-01T18:46:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/python-packages/sqlalchemy.git/commit/?id=5db55c999faae04ca338b0d4b034b3b99e0ca3fa'/>
<id>5db55c999faae04ca338b0d4b034b3b99e0ca3fa</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
