Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- old_tests/pyanaconda_test/indexed_dict_test.py | 49 -------------------------- pyanaconda/indexed_dict.py | 46 ------------------------ 2 files changed, 95 deletions(-) delete mode 100644 old_tests/pyanaconda_test/indexed_dict_test.py delete mode 100644 pyanaconda/indexed_dict.py
diff --git a/old_tests/pyanaconda_test/indexed_dict_test.py b/old_tests/pyanaconda_test/indexed_dict_test.py deleted file mode 100644 index 14185b6..0000000 --- a/old_tests/pyanaconda_test/indexed_dict_test.py +++ /dev/null @@ -1,49 +0,0 @@ -import mock - -class IndexedDictTest(mock.TestCase): - def setUp(self): - self.setupModules(['_isys']) - - def tearDown(self): - self.tearDownModules() - - def instantiation_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - self.assertIsInstance(d, IndexedDict) - - def append_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - stored_data = [1, 2, 3] - d["some_step"] = stored_data - self.assertIs(d["some_step"], stored_data) - - def cant_append_test(self): - from pyanaconda.indexed_dict import IndexedDict - def assign_int(indexed_dict): - indexed_dict[3] = [1, 2, 3] - d = IndexedDict() - self.assertRaises(TypeError, d.__setitem__, 3, [1, 2, 3]) - - def referencing_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - d["first"] = 10 - d["second"] = 20 - d["third"] = 30 - self.assertEqual(d[0], 10) - self.assertEqual(d[1], 20) - self.assertEqual(d[2], 30) - self.assertRaises(IndexError, d.__getitem__, 3) - - def index_test(self): - from pyanaconda.indexed_dict import IndexedDict - d = IndexedDict() - d["first"] = 10 - d["second"] = 20 - d["third"] = 30 - - self.assertEqual(d.index("first"), 0) - self.assertEqual(d.index("second"), 1) - self.assertEqual(d.index("third"), 2) diff --git a/pyanaconda/indexed_dict.py b/pyanaconda/indexed_dict.py deleted file mode 100644 index eb5050c..0000000 --- a/pyanaconda/indexed_dict.py +++ /dev/null @@ -1,46 +0,0 @@ -# indexed_dict.py -# Implements IndexedDictionary class. -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions of -# the GNU General Public License v.2, or (at your option) any later version. -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY expressed or implied, including the implied warranties of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. You should have received a copy of the -# GNU General Public License along with this program; if not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the -# source code or documentation are not subject to the GNU General Public -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. -# - -class IndexedDict(dict): - """ Indexed dictionary that remembers order of the inserted elements. - - Values can be inserted with string keys only, but referenced by both - string keys or index. - - There's a unit test for the class, please maintain it along. - """ - def __init__(self): - super(IndexedDict, self).__init__() - self._indexes = [] - - def __getitem__(self, key): - if type(key) is int: - key = self._indexes[key] - return super(IndexedDict, self).__getitem__(key) - - def __setitem__(self, key, value): - if type(key) is int: - raise TypeError("IndexedDict only accepts strings as new keys") - assert(len(self) == len(self._indexes)) - self._indexes.append(key) - return super(IndexedDict, self).__setitem__(key, value) - - def index(self, string_key): - return self._indexes.index(string_key)
On Thu, Jan 22, 2015 at 01:40:06PM +0100, Vratislav Podzimek wrote:
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com
Ack.
old_tests/pyanaconda_test/indexed_dict_test.py | 49 -------------------------- pyanaconda/indexed_dict.py | 46 ------------------------ 2 files changed, 95 deletions(-) delete mode 100644 old_tests/pyanaconda_test/indexed_dict_test.py delete mode 100644 pyanaconda/indexed_dict.py
diff --git a/old_tests/pyanaconda_test/indexed_dict_test.py b/old_tests/pyanaconda_test/indexed_dict_test.py deleted file mode 100644 index 14185b6..0000000 --- a/old_tests/pyanaconda_test/indexed_dict_test.py +++ /dev/null @@ -1,49 +0,0 @@ -import mock
-class IndexedDictTest(mock.TestCase):
- def setUp(self):
self.setupModules(['_isys'])- def tearDown(self):
self.tearDownModules()- def instantiation_test(self):
from pyanaconda.indexed_dict import IndexedDictd = IndexedDict()self.assertIsInstance(d, IndexedDict)- def append_test(self):
from pyanaconda.indexed_dict import IndexedDictd = IndexedDict()stored_data = [1, 2, 3]d["some_step"] = stored_dataself.assertIs(d["some_step"], stored_data)- def cant_append_test(self):
from pyanaconda.indexed_dict import IndexedDictdef assign_int(indexed_dict):indexed_dict[3] = [1, 2, 3]d = IndexedDict()self.assertRaises(TypeError, d.__setitem__, 3, [1, 2, 3])- def referencing_test(self):
from pyanaconda.indexed_dict import IndexedDictd = IndexedDict()d["first"] = 10d["second"] = 20d["third"] = 30self.assertEqual(d[0], 10)self.assertEqual(d[1], 20)self.assertEqual(d[2], 30)self.assertRaises(IndexError, d.__getitem__, 3)- def index_test(self):
from pyanaconda.indexed_dict import IndexedDictd = IndexedDict()d["first"] = 10d["second"] = 20d["third"] = 30self.assertEqual(d.index("first"), 0)self.assertEqual(d.index("second"), 1)self.assertEqual(d.index("third"), 2)diff --git a/pyanaconda/indexed_dict.py b/pyanaconda/indexed_dict.py deleted file mode 100644 index eb5050c..0000000 --- a/pyanaconda/indexed_dict.py +++ /dev/null @@ -1,46 +0,0 @@ -# indexed_dict.py -# Implements IndexedDictionary class. -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions of -# the GNU General Public License v.2, or (at your option) any later version. -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY expressed or implied, including the implied warranties of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. You should have received a copy of the -# GNU General Public License along with this program; if not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the -# source code or documentation are not subject to the GNU General Public -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. -#
-class IndexedDict(dict):
- """ Indexed dictionary that remembers order of the inserted elements.
Values can be inserted with string keys only, but referenced by bothstring keys or index.There's a unit test for the class, please maintain it along.- """
- def __init__(self):
super(IndexedDict, self).__init__()self._indexes = []- def __getitem__(self, key):
if type(key) is int:key = self._indexes[key]return super(IndexedDict, self).__getitem__(key)- def __setitem__(self, key, value):
if type(key) is int:raise TypeError("IndexedDict only accepts strings as new keys")assert(len(self) == len(self._indexes))self._indexes.append(key)return super(IndexedDict, self).__setitem__(key, value)- def index(self, string_key):
return self._indexes.index(string_key)-- 2.1.0
anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
anaconda-patches@lists.fedorahosted.org