Merge pull request #169 from joshmoore/5_6_cleanup

5.6 cleanup

bin/omero

@@ -69,19 +69,10 @@ top = os.path.join(exe, os.pardir, os.pardir)
 # This list needs to be kept in line with omero.cli.CLI._env
 #
 top = os.path.normpath(top)
-lib = os.path.join(top, "lib")
-lpy = os.path.join(top, "lib","python")
-ipy = os.path.join(top, "lib","fallback")
 var = os.path.join(top, "var")
 vlb = os.path.join(var, "lib")
-sys.path.append(lpy);
 sys.path.append(vlb);
-sys.path.append(ipy)
 
-if not os.path.exists(lib):
-    print("WARN: %s does not exist. It is unlikely that OMERO will run properly" % lib)
-
-#
 # Testing shortcut. If the first argument is an
 # empty string, exit sucessfully.
 #

src/omero/cli.py

@@ -1394,10 +1394,8 @@ def _env(self):
         This list needs to be kept in line with omero-py/bin/omero
 
         """
-        lpy = str(self.dir / "lib" / "python")
-        ipy = str(self.dir / "lib" / "fallback")
         vlb = str(self.dir / "var" / "lib")
-        paths = os.path.pathsep.join([lpy, vlb, ipy])
+        paths = os.path.pathsep.join([vlb])
 
         env = dict(os.environ)
         pypath = env.get("PYTHONPATH", None)