# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1355874858 -3600
# Node ID 0201fb592c0867fd9defc9be0b9c8eb85a7e86ff
# Parent  81d7d9842b736756458a538003f5a08dd31e8b2b
Consolidated PYTHONPATH management into common methods.

diff -r 81d7d9842b73 -r 0201fb592c08 moinsetup.py
--- a/moinsetup.py	Thu Dec 13 01:10:19 2012 +0100
+++ b/moinsetup.py	Wed Dec 19 00:54:18 2012 +0100
@@ -587,6 +587,24 @@
         else:
             return url_path
 
+    def _set_pythonpath(self):
+        path = os.environ.get("PYTHONPATH", "")
+
+        conf_dir = self.get_wikiconfig_directory()
+
+        if path:
+            os.environ["PYTHONPATH"] = path + ":" + self.prefix_site_packages + ":" + conf_dir
+        else:
+            os.environ["PYTHONPATH"] = self.prefix_site_packages + ":" + conf_dir
+
+        return path
+
+    def _reset_pythonpath(self, path):
+        if path:
+            os.environ["PYTHONPATH"] = path
+        else:
+            del os.environ["PYTHONPATH"]
+
     def get_moin_version(self):
 
         "Return the MoinMoin version."
@@ -988,21 +1006,13 @@
         email = raw_input("E-mail address: ")
         password = getpass("Password: ")
 
-        path = os.environ.get("PYTHONPATH", "")
-
-        if path:
-            os.environ["PYTHONPATH"] = path + ":" + self.common_dir
-        else:
-            os.environ["PYTHONPATH"] = self.common_dir
+        path = self._set_pythonpath()
 
         cmd = "%s --config-dir='%s' account create --name='%s' --email='%s' --password='%s'" % (
             self.get_moin_script(), self.common_dir, self.superuser, email, password)
         os.system(cmd)
 
-        if path:
-            os.environ["PYTHONPATH"] = path
-        else:
-            del os.environ["PYTHONPATH"]
+        self._reset_pythonpath(path)
 
     def make_site_files(self):
 
@@ -1539,23 +1549,11 @@
         Install a package from the file with the given 'package_filename'.
         """
 
-        path = os.environ.get("PYTHONPATH", "")
-
-        conf_dir = self.get_wikiconfig_directory()
-
-        if path:
-            os.environ["PYTHONPATH"] = path + ":" + self.prefix_site_packages + ":" + conf_dir
-        else:
-            os.environ["PYTHONPATH"] = self.prefix_site_packages + ":" + conf_dir
-
+        path = self._set_pythonpath()
         installer = join(self.prefix_site_packages, "MoinMoin", "packages.py")
         cmd = "%s %s i %s" % (sys.executable, installer, package_filename)
         os.system(cmd)
-
-        if path:
-            os.environ["PYTHONPATH"] = path
-        else:
-            del os.environ["PYTHONPATH"]
+        self._reset_pythonpath(path)
 
 def show_methods():
     print "Methods:"