Permalink
Browse files

Merge pull request #10 from pjdelport/master

Import the psycopg2.extras module fully.
  • Loading branch information...
2 parents 59fce78 + dc7ee4b commit 47d050cd2e2ccf7af40ff30938f14ba0f1af3590 @dcramer committed Aug 16, 2012
Showing with 4 additions and 2 deletions.
  1. +2 −1 .gitignore
  2. +1 −0 tox.ini
  3. +1 −1 uuidfield/fields.py
View
@@ -1,5 +1,6 @@
*.pyc
/build
+*.egg
*.egg-info/
/dist
-.tox
+.tox
View
@@ -3,5 +3,6 @@ downloadcache = {toxworkdir}/_download/
deps =
Django==1.3.1
psycopg2==2.4.1
+ django-nose
commands =
{envbindir}/python setup.py test
View
@@ -6,7 +6,7 @@
try:
# psycopg2 needs us to register the uuid type
- import psycopg2
+ import psycopg2.extras
psycopg2.extras.register_uuid()
except (ImportError, AttributeError):
pass

0 comments on commit 47d050c

Please sign in to comment.