| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
| |
Fixes #352.
|
| |
|
|
|
| |
Merge utility changed the linefeeds from unix to windows. Changed the
linefeeds back to unix linefeeds.
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
setup.py
tests/__init__.py
tests/testconfig.py
|
| |
|
|
|
|
| |
Dropped cyclic import from modules to tests: they were only working
because a second copy of the package was found in the project dir.
Use relative import so that 2to3 can do a good conversion.
|
|
|
Pulled the master branch from of Daniele's psycopg branch on github and
merged the changes.
|