← Back to branch summary

~ubuntu-branches/ubuntu/utopic/python-django/utopic

« back to all changes in this revision

Viewing changes to django/db/backends/postgresql_psycopg2/base.py

  • Committer: Package Import Robot
  • Author(s): Dave Walker (Daviey)
  • Date: 2012-02-17 14:59:51 UTC
  • mfrom: (4.4.18 sid)
  • Revision ID: package-import@ubuntu.com-20120217145951-irkw1txxjtqoqk2e
Tags: 1.3.1-4ubuntu1
https://launchpad.net/bugs/829487
https://launchpad.net/bugs/905837
* Merge with Debian.  Remaining changes:
  - 09_test_view_decorator_sleep.diff increases the sleep time to
    reduce race condition effects on build machines.
    https://code.djangoproject.com/ticket/16686  (LP: #829487)
* debian/patches/{psycopg2_creation.diff,compat-psycopg2-plus2.4.2.diff}:
  - New patches, resolve compatibility with psycopg2 > 2.4.1, patches
    based on upstream submissions, rebasing courtesy of Dave Pifke.
  - LP: #905837 

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/db/backends/postgresql_psycopg2/base.py
11
11
from django.db.backends.signals import connection_created
12
12
from django.db.backends.postgresql.operations import DatabaseOperations as PostgresqlDatabaseOperations
13
13
from django.db.backends.postgresql.client import DatabaseClient
14
 
from django.db.backends.postgresql.creation import DatabaseCreation
 
14
from django.db.backends.postgresql_psycopg2.creation import DatabaseCreation
15
15
from django.db.backends.postgresql.version import get_version
16
16
from django.db.backends.postgresql_psycopg2.introspection import DatabaseIntrospection
17
17
from django.utils.safestring import SafeUnicode, SafeString