Merge branch 'master' into fix_w32

Author: phdru

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{py,c}]
+indent_style = tab
+indent_size = tab
+tab_width = 4

AUTHORS

@@ -1,5 +1,5 @@
 Contributors:
- James William Pye [faults are mostly mine] <[email protected]>
+ James William Pye [faults are mostly mine]
  Elvis Pranskevichus
  William Grzybowski [subjective paramstyle]
  Barry Grussling [inet/cidr support]
@@ -8,13 +8,8 @@ Contributors:
 Support by Donation:
  AppCove Network
 
-Further Credits
-===============
-
-When licenses match, people win. Code is occasionally imported from other
-projects to enhance py-postgresql and to allow users to enjoy dependency free
-installation.
-
+Imported
+========
 
 DB-API 2.0 Test Case
 --------------------

LICENSE

@@ -1,10 +1,3 @@
-BSD Licensed Software
-
-   Unless stated otherwise, the contained software is
-        copyright 2004-2009, James Williame Pye.
-   For more information: http://python.projects.postgresql.org
-
-
 Redistribution and use in source and binary forms,
 with or without modification, are permitted provided
 that the following conditions are met:

MANIFEST.in

@@ -4,4 +4,3 @@ recursive-include postgresql *.c
 recursive-include postgresql *.sql
 recursive-include postgresql *.txt
 recursive-include postgresql/documentation/sphinx *.rst conf.py
-recursive-include postgresql/documentation/html *

README

@@ -0,0 +1,58 @@
+### About
+
+py-postgresql is a Python 3 package providing modules for working with PostgreSQL.  
+Primarily, a high-level driver for querying databases.
+
+For a high performance async interface, MagicStack's asyncpg
+http://github.com/MagicStack/asyncpg should be considered.
+
+py-postgresql, currently, does not have direct support for high-level async
+interfaces provided by recent versions of Python. Future versions may change this.
+
+### Advisory
+
+In v1.3, `postgresql.driver.dbapi20.connect` will now raise `ClientCannotConnectError` directly.
+Exception traps around connect should still function, but the `__context__` attribute
+on the error instance will be `None` in the usual failure case as it is no longer
+incorrectly chained. Trapping `ClientCannotConnectError` ahead of `Error` should
+allow both cases to co-exist in the event that data is being extracted from
+the `ClientCannotConnectError`.
+
+In v2.0, support for older versions of PostgreSQL and Python will be removed.  
+If you have automated installations using PyPI, make sure that they specify a major version.
+
+### Installation
+
+Using PyPI.org:
+
+	$ pip install py-postgresql
+
+From a clone:
+
+	$ git clone https://github.com/python-postgres/fe.git
+	$ cd fe
+	$ python3 ./setup.py install # Or use in-place without installation(PYTHONPATH).
+
+### Basic Usage
+
+```python
+import postgresql
+db = postgresql.open('pq://user:password@host:port/database')
+
+get_table = db.prepare("SELECT * from information_schema.tables WHERE table_name = $1")
+print(get_table("tables"))
+
+# Streaming, in a transaction.
+with db.xact():
+	for x in get_table.rows("tables"):
+		print(x)
+```
+
+### Documentation
+
+http://py-postgresql.readthedocs.io
+
+### Related
+
+- http://postgresql.org
+- http://python.org

README.md

@@ -1,15 +1,13 @@
 ##
 # py-postgresql root package
-# http://python.projects.postgresql.org
+# http://github.com/python-postgres/fe
 ##
 """
 py-postgresql is a Python package for using PostgreSQL. This includes low-level
-protocol tools, a driver(PG-API and DB-API), and cluster management tools.
+protocol tools, a driver(PG-API and DB-API 2.0), and cluster management tools.
 
-If it's not documented in the narratives, `postgresql.documentation.index`, then
-the stability of the APIs should *not* be trusted.
-
-See <http://postgresql.org> for more information about PostgreSQL.
+See <http://postgresql.org> for more information about PostgreSQL and <http://python.org>
+for information about Python.
 """
 __all__ = [
 	'__author__',