Skip to content

Commit 8156cfe

Browse files
author
James William Pye
committed
Rename changes.txt to a branch based name to help ease patch management/merging.
Conflicts: postgresql/documentation/html/admin.html postgresql/documentation/html/alock.html postgresql/documentation/html/bin.html postgresql/documentation/html/changes-v1.0.html postgresql/documentation/html/clientparameters.html postgresql/documentation/html/cluster.html postgresql/documentation/html/copyman.html postgresql/documentation/html/doctrees/changes.doctree postgresql/documentation/html/doctrees/environment.pickle postgresql/documentation/html/doctrees/index.doctree postgresql/documentation/html/doctrees/modules.doctree postgresql/documentation/html/driver.html postgresql/documentation/html/genindex.html postgresql/documentation/html/gotchas.html postgresql/documentation/html/index.html postgresql/documentation/html/lib.html postgresql/documentation/html/modules.html postgresql/documentation/html/notifyman.html postgresql/documentation/html/py-modindex.html postgresql/documentation/html/search.html postgresql/documentation/html/searchindex.js
1 parent c30454a commit 8156cfe

24 files changed

Lines changed: 2831 additions & 29 deletions
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
Changes
2-
=======
1+
Changes in v1.0
2+
===============
3+
4+
1.0.4 in development
5+
--------------------
6+
7+
* Alter how changes are represented in documentation to simplify merging.
38

49
1.0.3 released on 2011-09-24
510
----------------------------
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
##
22
# .documentation.changes
33
##
4-
__doc__ = open(__file__[:__file__.rfind('.')] + '.txt').read()
4+
from .. import project
5+
# It's a bit lame, but let's not get too fancy.
6+
bid = '.'.join(project.version_info[0:1])
7+
__doc__ = open(__file__[:__file__.rfind('.')] + '-v' + bid + '.txt').read()
58
__docformat__ = 'reStructuredText'
69
if __name__ == '__main__':
710
help(__name__)
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
Changes in v1.0
2+
===============
3+
4+
1.0.4 in development
5+
--------------------
6+
7+
* Alter how changes are represented in documentation to simplify merging.
8+
9+
1.0.3 released on 2011-09-24
10+
----------------------------
11+
12+
* Use raise x from y to generalize exceptions. (Elvis Pranskevichus)
13+
* Alter postgresql.string.quote_ident to always quote. (Elvis Pranskevichus)
14+
* Add postgresql.string.quote_ident_if_necessary (Modification of Elvis Pranskevichus' patch)
15+
* Many postgresql.string bug fixes (Elvis Pranskevichus)
16+
* Correct ResourceWarnings improving Python 3.2 support. (jwp)
17+
* Add test command to setup.py (Elvis Pranskevichus)
18+
19+
1.0.2 released on 2010-09-18
20+
----------------------------
21+
22+
* Add support for DOMAINs in registered composites. (Elvis Pranskevichus)
23+
* Properly raise StopIteration in Cursor.__next__. (Elvis Pranskevichus)
24+
* Add Cluster Management documentation.
25+
* Release savepoints after rolling them back.
26+
* Fix Startup() usage for Python 3.2.
27+
* Emit deprecation warning when 'gid' is given to xact().
28+
* Compensate for Python3.2's ElementTree API changes.
29+
30+
1.0.1 released on 2010-04-24
31+
----------------------------
32+
33+
* Fix unpacking of array NULLs. (Elvis Pranskevichus)
34+
* Fix .first()'s handling of counts and commands.
35+
Bad logic caused zero-counts to return the command tag.
36+
* Don't interrupt and close a temporal connection if it's not open.
37+
* Use the Driver's typio attribute for TypeIO overrides. (Elvis Pranskevichus)
38+
39+
1.0 released on 2010-03-27
40+
--------------------------
41+
42+
* **DEPRECATION**: Removed 2PC support documentation.
43+
* **DEPRECATION**: Removed pg_python and pg_dotconf 'scripts'.
44+
They are still accessible by python3 -m postgresql.bin.pg_*
45+
* Add support for binary hstore.
46+
* Add support for user service files.
47+
* Implement a Copy manager for direct connection-to-connection COPY operations.
48+
* Added db.do() method for DO-statement support(convenience method).
49+
* Set the default client_min_messages level to WARNING.
50+
NOTICEs are often not desired by programmers, and py-postgresql's
51+
high verbosity further irritates that case.
52+
* Added postgresql.project module to provide project information.
53+
Project name, author, version, etc.
54+
* Increased default recvsize and chunksize for improved performance.
55+
* 'D' messages are special cased as builtins.tuples instead of
56+
protocol.element3.Tuple
57+
* Alter Statement.chunks() to return chunks of builtins.tuple. Being
58+
an interface intended for speed, types.Row() impedes its performance.
59+
* Fix handling of infinity values with timestamptz, timestamp, and date.
60+
[Bug reported by Axel Rau.]
61+
* Correct representation of PostgreSQL ARRAYs by properly recording
62+
lowerbounds and upperbounds. Internally, sub-ARRAYs have their own
63+
element lists.
64+
* Implement a NotificationManager for managing the NOTIFYs received
65+
by a connection. The class can manage NOTIFYs from multiple
66+
connections, whereas the db.wait() method is tailored for single targets.
67+
* Implement an ALock class for managing advisory locks using the
68+
threading.Lock APIs. [Feedback from Valentine Gogichashvili]
69+
* Implement reference symbols. Allow libraries to define symbols that
70+
are used to create queries that inherit the original symbol's type and
71+
execution method. ``db.prepare(db.prepare(...).first())``
72+
* Fix handling of unix domain sockets by pg.open and driver.connect.
73+
[Reported by twitter.com/rintavarustus]
74+
* Fix typo/dropped parts of a raise LoadError in .lib.
75+
[Reported by Vlad Pranskevichus]
76+
* Fix db.tracer and pg_python's --pq-trace=
77+
* Fix count return from .first() method. Failed to provide an empty
78+
tuple for the rformats of the bind statement.
79+
[Reported by dou dou]

postgresql/documentation/html/_sources/index.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Contents
2323
lib
2424
clientparameters
2525
gotchas
26-
changes
2726

2827
Reference
2928
---------
@@ -34,6 +33,14 @@ Reference
3433
bin
3534
modules
3635

36+
Changes
37+
-------
38+
39+
.. toctree::
40+
:maxdepth: 1
41+
42+
changes-v1.0
43+
3744
Sample Code
3845
-----------
3946

postgresql/documentation/html/admin.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
<head>
99
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1010

11+
<<<<<<< HEAD
1112
<title>Administration &mdash; py-postgresql 1.1.0dev documentation</title>
13+
=======
14+
<title>Administration &mdash; py-postgresql 1.0.4dev documentation</title>
15+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
1216

1317
<link rel="stylesheet" href="_static/default.css" type="text/css" />
1418
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1519

1620
<script type="text/javascript">
1721
var DOCUMENTATION_OPTIONS = {
1822
URL_ROOT: '',
23+
<<<<<<< HEAD
1924
VERSION: '1.1.0dev',
25+
=======
26+
VERSION: '1.0.4dev',
27+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
2028
COLLAPSE_INDEX: false,
2129
FILE_SUFFIX: '.html',
2230
HAS_SOURCE: true
@@ -25,7 +33,11 @@
2533
<script type="text/javascript" src="_static/jquery.js"></script>
2634
<script type="text/javascript" src="_static/underscore.js"></script>
2735
<script type="text/javascript" src="_static/doctools.js"></script>
36+
<<<<<<< HEAD
2837
<link rel="top" title="py-postgresql 1.1.0dev documentation" href="index.html" />
38+
=======
39+
<link rel="top" title="py-postgresql 1.0.4dev documentation" href="index.html" />
40+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
2941
<link rel="next" title="Driver" href="driver.html" />
3042
<link rel="prev" title="py-postgresql" href="index.html" />
3143
</head>
@@ -45,7 +57,11 @@ <h3>Navigation</h3>
4557
<li class="right" >
4658
<a href="index.html" title="py-postgresql"
4759
accesskey="P">previous</a> |</li>
60+
<<<<<<< HEAD
4861
<li><a href="index.html">py-postgresql 1.1.0dev documentation</a> &raquo;</li>
62+
=======
63+
<li><a href="index.html">py-postgresql 1.0.4dev documentation</a> &raquo;</li>
64+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
4965
</ul>
5066
</div>
5167

@@ -150,12 +166,20 @@ <h3>Navigation</h3>
150166
<li class="right" >
151167
<a href="index.html" title="py-postgresql"
152168
>previous</a> |</li>
169+
<<<<<<< HEAD
153170
<li><a href="index.html">py-postgresql 1.1.0dev documentation</a> &raquo;</li>
171+
=======
172+
<li><a href="index.html">py-postgresql 1.0.4dev documentation</a> &raquo;</li>
173+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
154174
</ul>
155175
</div>
156176
<div class="footer">
157177
&copy; Copyright 2010, James William Pye &lt;x@jwp.name&gt;.
178+
<<<<<<< HEAD
158179
Last updated on Sep 09, 2011.
180+
=======
181+
Last updated on Oct 15, 2011.
182+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
159183
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1pre.
160184
</div>
161185
</body>

postgresql/documentation/html/alock.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
<head>
99
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1010

11+
<<<<<<< HEAD
1112
<title>Advisory Locks &mdash; py-postgresql 1.1.0dev documentation</title>
13+
=======
14+
<title>Advisory Locks &mdash; py-postgresql 1.0.4dev documentation</title>
15+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
1216

1317
<link rel="stylesheet" href="_static/default.css" type="text/css" />
1418
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1519

1620
<script type="text/javascript">
1721
var DOCUMENTATION_OPTIONS = {
1822
URL_ROOT: '',
23+
<<<<<<< HEAD
1924
VERSION: '1.1.0dev',
25+
=======
26+
VERSION: '1.0.4dev',
27+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
2028
COLLAPSE_INDEX: false,
2129
FILE_SUFFIX: '.html',
2230
HAS_SOURCE: true
@@ -25,7 +33,11 @@
2533
<script type="text/javascript" src="_static/jquery.js"></script>
2634
<script type="text/javascript" src="_static/underscore.js"></script>
2735
<script type="text/javascript" src="_static/doctools.js"></script>
36+
<<<<<<< HEAD
2837
<link rel="top" title="py-postgresql 1.1.0dev documentation" href="index.html" />
38+
=======
39+
<link rel="top" title="py-postgresql 1.0.4dev documentation" href="index.html" />
40+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
2941
<link rel="next" title="Cluster Management" href="cluster.html" />
3042
<link rel="prev" title="Notification Management" href="notifyman.html" />
3143
</head>
@@ -45,7 +57,11 @@ <h3>Navigation</h3>
4557
<li class="right" >
4658
<a href="notifyman.html" title="Notification Management"
4759
accesskey="P">previous</a> |</li>
60+
<<<<<<< HEAD
4861
<li><a href="index.html">py-postgresql 1.1.0dev documentation</a> &raquo;</li>
62+
=======
63+
<li><a href="index.html">py-postgresql 1.0.4dev documentation</a> &raquo;</li>
64+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
4965
</ul>
5066
</div>
5167

@@ -216,12 +232,20 @@ <h3>Navigation</h3>
216232
<li class="right" >
217233
<a href="notifyman.html" title="Notification Management"
218234
>previous</a> |</li>
235+
<<<<<<< HEAD
219236
<li><a href="index.html">py-postgresql 1.1.0dev documentation</a> &raquo;</li>
237+
=======
238+
<li><a href="index.html">py-postgresql 1.0.4dev documentation</a> &raquo;</li>
239+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
220240
</ul>
221241
</div>
222242
<div class="footer">
223243
&copy; Copyright 2010, James William Pye &lt;x@jwp.name&gt;.
244+
<<<<<<< HEAD
224245
Last updated on Sep 09, 2011.
246+
=======
247+
Last updated on Oct 15, 2011.
248+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
225249
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1pre.
226250
</div>
227251
</body>

postgresql/documentation/html/bin.html

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
<head>
99
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1010

11+
<<<<<<< HEAD
1112
<title>Commands &mdash; py-postgresql 1.1.0dev documentation</title>
13+
=======
14+
<title>Commands &mdash; py-postgresql 1.0.4dev documentation</title>
15+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
1216

1317
<link rel="stylesheet" href="_static/default.css" type="text/css" />
1418
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1519

1620
<script type="text/javascript">
1721
var DOCUMENTATION_OPTIONS = {
1822
URL_ROOT: '',
23+
<<<<<<< HEAD
1924
VERSION: '1.1.0dev',
25+
=======
26+
VERSION: '1.0.4dev',
27+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
2028
COLLAPSE_INDEX: false,
2129
FILE_SUFFIX: '.html',
2230
HAS_SOURCE: true
@@ -25,9 +33,13 @@
2533
<script type="text/javascript" src="_static/jquery.js"></script>
2634
<script type="text/javascript" src="_static/underscore.js"></script>
2735
<script type="text/javascript" src="_static/doctools.js"></script>
36+
<<<<<<< HEAD
2837
<link rel="top" title="py-postgresql 1.1.0dev documentation" href="index.html" />
38+
=======
39+
<link rel="top" title="py-postgresql 1.0.4dev documentation" href="index.html" />
40+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
2941
<link rel="next" title="Modules" href="modules.html" />
30-
<link rel="prev" title="Changes" href="changes.html" />
42+
<link rel="prev" title="Gotchas" href="gotchas.html" />
3143
</head>
3244
<body>
3345
<div class="related">
@@ -43,9 +55,13 @@ <h3>Navigation</h3>
4355
<a href="modules.html" title="Modules"
4456
accesskey="N">next</a> |</li>
4557
<li class="right" >
46-
<a href="changes.html" title="Changes"
58+
<a href="gotchas.html" title="Gotchas"
4759
accesskey="P">previous</a> |</li>
60+
<<<<<<< HEAD
4861
<li><a href="index.html">py-postgresql 1.1.0dev documentation</a> &raquo;</li>
62+
=======
63+
<li><a href="index.html">py-postgresql 1.0.4dev documentation</a> &raquo;</li>
64+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
4965
</ul>
5066
</div>
5167

@@ -291,8 +307,8 @@ <h3><a href="index.html">Table Of Contents</a></h3>
291307
</ul>
292308

293309
<h4>Previous topic</h4>
294-
<p class="topless"><a href="changes.html"
295-
title="previous chapter">Changes</a></p>
310+
<p class="topless"><a href="gotchas.html"
311+
title="previous chapter">Gotchas</a></p>
296312
<h4>Next topic</h4>
297313
<p class="topless"><a href="modules.html"
298314
title="next chapter">Modules</a></p>
@@ -331,14 +347,22 @@ <h3>Navigation</h3>
331347
<a href="modules.html" title="Modules"
332348
>next</a> |</li>
333349
<li class="right" >
334-
<a href="changes.html" title="Changes"
350+
<a href="gotchas.html" title="Gotchas"
335351
>previous</a> |</li>
352+
<<<<<<< HEAD
336353
<li><a href="index.html">py-postgresql 1.1.0dev documentation</a> &raquo;</li>
354+
=======
355+
<li><a href="index.html">py-postgresql 1.0.4dev documentation</a> &raquo;</li>
356+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
337357
</ul>
338358
</div>
339359
<div class="footer">
340360
&copy; Copyright 2010, James William Pye &lt;x@jwp.name&gt;.
361+
<<<<<<< HEAD
341362
Last updated on Sep 09, 2011.
363+
=======
364+
Last updated on Oct 15, 2011.
365+
>>>>>>> f09974d... Rename changes.txt to a branch based name to help ease patch management/merging.
342366
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1pre.
343367
</div>
344368
</body>

0 commit comments

Comments
 (0)