Commit 3d842a0a authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Merge branch 'master' of github.com:django/django

parents e4d4cb61 4b11762f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ def rmtree_errorhandler(func, path, exc_info):
    continue without problems.
    """
    exctype, value = exc_info[:2]
    # lookin for a windows error
    # looking for a windows error
    if exctype is not WindowsError or 'Access is denied' not in str(value):
        raise
    # file type should currently be read only
+7 −3
Original line number Diff line number Diff line
@@ -128,6 +128,12 @@ class SortedDict(dict):
        return self.__class__([(key, copy.deepcopy(value, memo))
                               for key, value in self.iteritems()])

    def __copy__(self):
        # The Python's default copy implementation will alter the state
        # of self. The reason for this seems complex but is likely related to
        # subclassing dict.
        return self.copy()

    def __setitem__(self, key, value):
        if key not in self:
            self.keyOrder.append(key)
@@ -200,9 +206,7 @@ class SortedDict(dict):
    def copy(self):
        """Returns a copy of this object."""
        # This way of initializing the copy means it works for subclasses, too.
        obj = self.__class__(self)
        obj.keyOrder = self.keyOrder[:]
        return obj
        return self.__class__(self)

    def __repr__(self):
        """
+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ Here's how this might look in a fabfile::
    @roles('static')
    def deploy_static():
        local('./manage.py collectstatic')
        project.rysnc_project(
        project.rsync_project(
            remote_dir = env.remote_static_root,
            local_dir = env.local_static_root,
            delete = True
+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ class SortedDictTests(SimpleTestCase):
            {7: 'seven', 1: 'one', 9: 'nine'}
        )

    def test_copy(self):
        orig = SortedDict(((1, "one"), (0, "zero"), (2, "two")))
        copied = copy.copy(orig)
        self.assertEqual(orig.keys(), [1, 0, 2])
        self.assertEqual(copied.keys(), [1, 0, 2])

    def test_clear(self):
        self.d1.clear()
        self.assertEqual(self.d1, {})