Jason Erickson
68ccac1766
Fixed linefeeds on merged files to unix linefeeds
...
Merge utility changed the linefeeds from unix to windows. Changed the
linefeeds back to unix linefeeds.
2011-02-10 17:16:10 -07:00
Jason Erickson
3fc4dcec06
Merge remote branch 'upstream/devel' into devel
...
Conflicts:
setup.py
tests/__init__.py
tests/testconfig.py
2011-02-10 16:07:38 -07:00
Jason Erickson
b075017ad9
Pulled down changes from dvarrazzo branch on gh
...
Pulled the master branch from of Daniele's psycopg branch on github and
merged the changes.
2011-02-10 15:59:31 -07:00
Daniele Varrazzo
ade1b2cc7b
Test suite converted into a proper package.
...
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.
2010-12-21 05:02:19 +00:00
