From 6c4f5846c8e21d6e48347b7e661edb72ffabb9f1 Mon Sep 17 00:00:00 2001
From: nkryptic <nkryptic@gmail.com>
Date: Tue, 12 Mar 2013 01:08:59 -0400
Subject: Add full Python 3 compatibility (Closes #10, #20, #49).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also:
- update travis.yml to build against 2.6-2.7 and 3.2-3.3
- Switch to relative imports

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 factory/base.py         |  2 +-
 factory/compat.py       | 33 +++++++++++++++++++++++++++++++++
 factory/containers.py   |  4 ++--
 factory/declarations.py |  7 ++++---
 factory/utils.py        |  3 ++-
 5 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 factory/compat.py

(limited to 'factory')

diff --git a/factory/base.py b/factory/base.py
index f3d5eab..ff3e558 100644
--- a/factory/base.py
+++ b/factory/base.py
@@ -24,7 +24,7 @@ import re
 import sys
 import warnings
 
-from factory import containers
+from . import containers
 
 # Strategies
 BUILD_STRATEGY = 'build'
diff --git a/factory/compat.py b/factory/compat.py
new file mode 100644
index 0000000..a924de0
--- /dev/null
+++ b/factory/compat.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2010 Mark Sandstrom
+# Copyright (c) 2011-2013 Raphaël Barrois
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+
+"""Compatibility tools"""
+
+import sys
+
+is_python2 = (sys.version_info[0] == 2)
+
+if is_python2:
+    string_types = (str, unicode)
+else:
+    string_types = (str,)
diff --git a/factory/containers.py b/factory/containers.py
index 31ee58b..0859a10 100644
--- a/factory/containers.py
+++ b/factory/containers.py
@@ -21,8 +21,8 @@
 # THE SOFTWARE.
 
 
-from factory import declarations
-from factory import utils
+from . import declarations
+from . import utils
 
 
 class CyclicDefinitionError(Exception):
diff --git a/factory/declarations.py b/factory/declarations.py
index b491bfb..2b1fc05 100644
--- a/factory/declarations.py
+++ b/factory/declarations.py
@@ -25,7 +25,8 @@ import collections
 import itertools
 import warnings
 
-from factory import utils
+from . import compat
+from . import utils
 
 
 class OrderedDeclaration(object):
@@ -294,7 +295,7 @@ class SubFactory(ParameteredAttribute):
             self.factory_module = self.factory_name = ''
         else:
             # Must be a string
-            if not isinstance(factory, basestring) or '.' not in factory:
+            if not isinstance(factory, compat.string_types) or '.' not in factory:
                 raise ValueError(
                         "The argument of a SubFactory must be either a class "
                         "or the fully qualified path to a Factory class; got "
@@ -393,7 +394,7 @@ class RelatedFactory(PostGenerationDeclaration):
             self.factory_module = self.factory_name = ''
         else:
             # Must be a string
-            if not isinstance(factory, basestring) or '.' not in factory:
+            if not isinstance(factory, compat.string_types) or '.' not in factory:
                 raise ValueError(
                         "The argument of a SubFactory must be either a class "
                         "or the fully qualified path to a Factory class; got "
diff --git a/factory/utils.py b/factory/utils.py
index 90fdfc3..fb8cfef 100644
--- a/factory/utils.py
+++ b/factory/utils.py
@@ -43,7 +43,8 @@ def extract_dict(prefix, kwargs, pop=True, exclude=()):
     """
     prefix = prefix + ATTR_SPLITTER
     extracted = {}
-    for key in kwargs.keys():
+
+    for key in list(kwargs):
         if key in exclude:
             continue
 
-- 
cgit v1.2.3