-

cool-RR · cool-RR · commit 682ded480f47 · 2013-09-02T03:20:24.000+03:00
diff --git a/python_toolbox/context_management/delegating_context_manager.py b/python_toolbox/context_management/delegating_context_manager.py
@@ -9,7 +9,7 @@
 
 import abc
 
-from python_toolbox import proxy_property
+from python_toolbox import misc_tools
 
 from .context_manager import ContextManager
 
@@ -34,9 +34,9 @@ class DelegatingContextManager(ContextManager):
     You may implement this as either an instance attribute or a property.
     '''
     
-    __enter__ = proxy_property.ProxyProperty(
+    __enter__ = misc_tools.ProxyProperty(
         '.delegatee_context_manager.__enter__'
     )
-    __exit__ = proxy_property.ProxyProperty(
+    __exit__ = misc_tools.ProxyProperty(
         '.delegatee_context_manager.__exit__'
     )
diff --git a/python_toolbox/context_management/reentrant_context_manager.py b/python_toolbox/context_management/reentrant_context_manager.py
@@ -10,7 +10,7 @@
 import abc
 
 from python_toolbox import caching
-from python_toolbox.proxy_property import ProxyProperty
+from python_toolbox.misc_tools import ProxyProperty
 
 from .context_manager import ContextManager
 
diff --git a/python_toolbox/freezing/freezer.py b/python_toolbox/freezing/freezer.py
@@ -10,7 +10,7 @@
 import abc
 
 from python_toolbox import context_management
-from python_toolbox import proxy_property
+from python_toolbox import misc_tools
 from python_toolbox import caching
 
 from .delegatee_context_manager import DelegateeContextManager
@@ -41,7 +41,7 @@ class Freezer(context_management.DelegatingContextManager):
     '''The context manager which implements our `__enter__` and `__exit__`.'''
     
     
-    frozen = proxy_property.ProxyProperty('.delegatee_context_manager.depth')
+    frozen = misc_tools.ProxyProperty('.delegatee_context_manager.depth')
     '''
     An integer specifying the freezer's level of frozenness.
     
diff --git a/python_toolbox/identities.py b/python_toolbox/identities.py
@@ -7,7 +7,7 @@
 See its documentation for more information.
 '''
 
-from python_toolbox import proxy_property
+from python_toolbox import misc_tools
 from python_toolbox.persistent import CrossProcessPersistent
 
 
@@ -44,7 +44,7 @@ def has_same_identity_as(self, other):
     __and__ = has_same_identity_as
     
     
-    personality = proxy_property.ProxyProperty(
+    personality = misc_tools.ProxyProperty(
         '._HasIdentity__identity.personality',
         doc='''Personality containing a human name and two colors.'''
     )
diff --git a/python_toolbox/misc_tools/__init__.py b/python_toolbox/misc_tools/__init__.py
@@ -10,4 +10,5 @@
     do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,
     general_sum, general_product, is_legal_email_address, is_type
 )
-from . import name_mangling
+from . import name_mangling
+from .proxy_property import ProxyProperty
diff --git a/python_toolbox/misc_tools/proxy_property.py b/python_toolbox/misc_tools/proxy_property.py
@@ -7,8 +7,6 @@
 See its documentation for more information.
 '''
 
-from python_toolbox import address_tools
-
 
 class ProxyProperty(object):
     '''
@@ -68,6 +66,7 @@ def __get__(self, obj, our_type=None):
             return self
         else:
             if '.' in self.attribute_name:
+                from python_toolbox import address_tools
                 return address_tools.resolve('obj.%s' % self.attribute_name,
                                              namespace={'obj': obj})
             else:
@@ -79,6 +78,7 @@ def __set__(self, obj, value):
         # `__delete__`?
         
         if '.' in self.attribute_name:
+            from python_toolbox import address_tools
             left_segment, right_segment = self.attribute_name.rsplit('.', 1)
             deepest_object = address_tools.resolve('obj.%s' % left_segment,
                                                    namespace={'obj': obj})
diff --git a/python_toolbox/wx_tools/widgets/cute_tree_ctrl.py b/python_toolbox/wx_tools/widgets/cute_tree_ctrl.py
@@ -9,7 +9,7 @@
 
 import wx
 
-from python_toolbox.proxy_property import ProxyProperty
+from python_toolbox.misc_tools import ProxyProperty
 
 from python_toolbox import sequence_tools
 from python_toolbox.wx_tools.widgets.cute_control import CuteControl
diff --git a/test_python_toolbox/test_proxy_property.py b/test_python_toolbox/test_proxy_property.py
@@ -1,15 +1,15 @@
 # Copyright 2009-2013 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''Testing modules for `python_toolbox.proxy_property.ProxyProperty`.'''
+'''Testing modules for `python_toolbox.misc_tools.ProxyProperty`.'''
 
 from __future__ import with_statement
 
 import uuid
 
 from python_toolbox import cute_testing
 
-from python_toolbox.proxy_property import ProxyProperty
+from python_toolbox.misc_tools import ProxyProperty
 
 
 class Object(object):

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@`
`10`	`10`	`do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,`
`11`	`11`	`general_sum, general_product, is_legal_email_address, is_type`
`12`	`12`	`)`
`13`		`-from . import name_mangling`
	`13`	`+from . import name_mangling`
	`14`	`+from .proxy_property import ProxyProperty`