On Tue, 2013-12-03 at 17:03 -0500, Chris Lumens wrote:
This is the only place it's used, so don't export it either.
---
pyanaconda/ui/__init__.py | 15 ++++++++++++++-
pyanaconda/ui/common.py | 13 -------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pyanaconda/ui/__init__.py b/pyanaconda/ui/__init__.py
index 44f27e6..b1eb060 100644
--- a/pyanaconda/ui/__init__.py
+++ b/pyanaconda/ui/__init__.py
@@ -21,8 +21,21 @@
__all__ = ["UserInterface"]
+import copy
import os
-from pyanaconda.ui.common import collect, PathDict
+from pyanaconda.ui.common import collect
+
+class PathDict(dict):
+ """Dictionary class supporting + operator"""
+ def __add__(self, ext):
+ new_dict = copy.copy(self)
+ for key, value in ext.iteritems():
+ try:
+ new_dict[key].extend(value)
+ except KeyError:
+ new_dict[key] = value[:]
+
+ return new_dict
class UserInterface(object):
"""This is the base class for all kinds of install UIs. It
primarily
diff --git a/pyanaconda/ui/common.py b/pyanaconda/ui/common.py
index fc2c1e2..5e08104 100644
--- a/pyanaconda/ui/common.py
+++ b/pyanaconda/ui/common.py
@@ -23,7 +23,6 @@
import os
import imp
import inspect
-import copy
import sys
import types
@@ -34,18 +33,6 @@ from pykickstart.constants import FIRSTBOOT_RECONFIG
import logging
log = logging.getLogger("anaconda")
-class PathDict(dict):
- """Dictionary class supporting + operator"""
- def __add__(self, ext):
- new_dict = copy.copy(self)
- for key, value in ext.iteritems():
- try:
- new_dict[key].extend(value)
- except KeyError:
- new_dict[key] = value[:]
-
- return new_dict
-
class UIObject(object):
"""This is the base class from which all other UI classes are
derived. It
thus contains only attributes and methods that are common to everything
These both look good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic