fix to backref when its none for one-to-one

diff --git a/lib/sqlalchemy/ext/activemapper.py b/lib/sqlalchemy/ext/activemapper.py
index aa71471d2117f5235a7a840493f0676fd00bf073..4ff7a150b6e55f7d2e067f91765e6507c535b9c3 100644 (file)
--- a/lib/sqlalchemy/ext/activemapper.py
+++ b/lib/sqlalchemy/ext/activemapper.py
@@ -62,7 +62,9 @@ class one_to_many(relationship):
 
 class one_to_one(relationship):
     def __init__(self, classname, colname=None, backref=None, private=False, lazy=True):
-        relationship.__init__(self, classname, colname, create_backref(backref, uselist=False), private, lazy, uselist=False)
+        if backref is not None:
+            backref = create_backref(backref, uselist=False)
+        relationship.__init__(self, classname, colname, backref, private, lazy, uselist=False)
 
 class many_to_many(relationship):
     def __init__(self, classname, secondary, backref=None, lazy=True):