Merge lp:~therve/landscape-client/constants into lp:~landscape/landscape-client/trunk

[Thomas Herve]

Extract the 2 sets of used constants in a specific module, and make some general adjustments to reduce imports.

[Free Ekanayaka (free.ekanayaka)]

Great! +1

review: Approve

[Kevin McDermott (bigkevmcd)]

Looks good to me, thanks for adding an actual date to remove the patch to initgroups :-)

+1

review: Approve

=== modified file 'landscape/__init__.py'
--- landscape/__init__.py	2010-06-15 13:53:00 +0000
+++ landscape/__init__.py	2010-06-23 18:35:33 +0000
@@ -1,3 +1,5 @@
+import sys
+
 DEBIAN_REVISION = ""
 UPSTREAM_VERSION = "1.5.2"
 VERSION = "%s%s" % (UPSTREAM_VERSION, DEBIAN_REVISION)
@@ -46,6 +48,10 @@
     from landscape.lib.initgroups import initgroups as cinitgroups
     return cinitgroups(pwd.getpwuid(uid).pw_name, gid)
 
-# Patch twisted initgroups implementation, which can result in very long calls
-# to grp.getrlall(). See http://twistedmatrix.com/trac/ticket/3226
-util.initgroups = initgroups
+
+if "twisted.python._initgroups" not in sys.modules:
+    # Patch twisted initgroups implementation, which can result in very long
+    # calls to grp.getrlall(). See http://twistedmatrix.com/trac/ticket/3226
+    # We can remove that bit when Lucid is our oldest supported version
+    # (May 2013).
+    util.initgroups = initgroups

=== added file 'landscape/constants.py'
--- landscape/constants.py	1970-01-01 00:00:00 +0000
+++ landscape/constants.py	2010-06-23 18:35:33 +0000
@@ -0,0 +1,28 @@
+"""
+Hold constants used across landscape, to reduce import size when one only needs
+to look at those values.
+"""
+
+APT_PREFERENCES_SIZE_LIMIT = 1048576 # 1 MByte
+
+SUCCESS_RESULT = 1
+ERROR_RESULT = 100
+DEPENDENCY_ERROR_RESULT = 101
+POLICY_STRICT = 0
+POLICY_ALLOW_INSTALLS = 1
+POLICY_ALLOW_ALL_CHANGES = 2
+
+# The amount of time to wait while we have unknown package data before
+# reporting an error to the server in response to an operation.
+# The two common cases of this are:
+# 1.  The server requested an operation that we've decided requires some
+# dependencies, but we don't know the package ID of those dependencies.  It
+# should only take a bit more than 10 minutes for that to be resolved by the
+# package reporter.
+# 2.  We lost some package data, for example by a deb archive becoming
+# inaccessible for a while.  The earliest we can reasonably assume that to be
+# resolved is in 60 minutes, when the smart cronjob runs again.
+
+# So we'll give the problem one chance to resolve itself, by only waiting for
+# one run of smart update.
+UNKNOWN_PACKAGE_DATA_TIMEOUT = 70 * 60

=== modified file 'landscape/lib/fetch.py'
--- landscape/lib/fetch.py	2010-02-17 13:51:30 +0000
+++ landscape/lib/fetch.py	2010-06-23 18:35:33 +0000
@@ -4,8 +4,6 @@
 from optparse import OptionParser
 from StringIO import StringIO
 
-import pycurl
-
 from twisted.internet.threads import deferToThread
 from twisted.internet.defer import DeferredList
 
@@ -56,6 +54,7 @@
                     on the request.
     @param cainfo: Path to the file with CA certificates.
     """
+    import pycurl
     output = StringIO(data)
     input = StringIO()
 

=== modified file 'landscape/monitor/aptpreferences.py'
--- landscape/monitor/aptpreferences.py	2010-04-23 13:39:22 +0000
+++ landscape/monitor/aptpreferences.py	2010-06-23 18:35:33 +0000
@@ -1,9 +1,9 @@
 import os
 
+from landscape.constants import APT_PREFERENCES_SIZE_LIMIT
+
 from landscape.monitor.plugin import DataWatcher
 
-APT_PREFERENCES_SIZE_LIMIT = 1048576 # 1 MByte
-
 
 class AptPreferences(DataWatcher):
     """

=== modified file 'landscape/package/changer.py'
--- landscape/package/changer.py	2010-04-01 10:09:09 +0000
+++ landscape/package/changer.py	2010-06-23 18:35:33 +0000
@@ -8,6 +8,11 @@
 
 from twisted.internet.defer import maybeDeferred, succeed
 
+from landscape.constants import (
+    SUCCESS_RESULT, ERROR_RESULT, DEPENDENCY_ERROR_RESULT, POLICY_STRICT,
+    POLICY_ALLOW_INSTALLS, POLICY_ALLOW_ALL_CHANGES,
+    UNKNOWN_PACKAGE_DATA_TIMEOUT)
+
 from landscape.lib.fs import create_file
 from landscape.package.reporter import find_reporter_command
 from landscape.package.taskhandler import (
@@ -16,29 +21,6 @@
 from landscape.manager.manager import SUCCEEDED
 
 
-SUCCESS_RESULT = 1
-ERROR_RESULT = 100
-DEPENDENCY_ERROR_RESULT = 101
-POLICY_STRICT = 0
-POLICY_ALLOW_INSTALLS = 1
-POLICY_ALLOW_ALL_CHANGES = 2
-
-# The amount of time to wait while we have unknown package data before
-# reporting an error to the server in response to an operation.
-# The two common cases of this are:
-# 1.  The server requested an operation that we've decided requires some
-# dependencies, but we don't know the package ID of those dependencies.  It
-# should only take a bit more than 10 minutes for that to be resolved by the
-# package reporter.
-# 2.  We lost some package data, for example by a deb archive becoming
-# inaccessible for a while.  The earliest we can reasonably assume that to be
-# resolved is in 60 minutes, when the smart cronjob runs again.
-
-# So we'll give the problem one chance to resolve itself, by only waiting for
-# one run of smart update.
-UNKNOWN_PACKAGE_DATA_TIMEOUT = 70 * 60
-
-
 class UnknownPackageData(Exception):
     """Raised when an ID or a hash isn't known."""
 

=== modified file 'landscape/upgraders/legacy.py'
--- landscape/upgraders/legacy.py	2008-06-10 10:56:01 +0000
+++ landscape/upgraders/legacy.py	2010-06-23 18:35:33 +0000
@@ -1,5 +1,4 @@
 import os
-import gdbm
 
 from landscape.patch import UpgradeManager
 from landscape.lib.persist import Persist
@@ -56,6 +55,7 @@
 
     # package data needs to be migrated to a sqlite db
     if os.path.exists(hashdb_filename):
+        import gdbm
         hashdb = gdbm.open(hashdb_filename, "r")
         store = PackageStore(sqlite_filename)