From b862584d289e09a6c12d862521f6a867a6f7cffa Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Thu, 3 Jul 2008 23:18:11 +0200
Subject: Remove xsd and -x cmdline option

---
 portato.py | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'portato.py')

diff --git a/portato.py b/portato.py
index a4f871a..69fb792 100755
--- a/portato.py
+++ b/portato.py
@@ -36,30 +36,13 @@ def main ():
 	parser.add_option("--shm", action = "store", nargs = 3, type="long", dest = "shm",
 			help = SUPPRESS_HELP)
 
-	parser.add_option("-x", "--validate", action = "store", dest = "validate", metavar="PLUGIN",
-			help = _("validates the given plugin xml instead of launching Portato"))
-
 	parser.add_option("-F", "--no-fork", "-L", action = "store_true", dest = "nofork", default = False, 
 			help = _("do not fork off as root") + (" (%s)" % _("-L is deprecated")))
 
 	# run parser
 	(options, args) = parser.parse_args()
 
-	if options.validate: # validate a plugin
-		from lxml import etree
-		try:
-			etree.XMLSchema(file = XSD_LOCATION).assertValid(etree.parse(options.validate))
-		except etree.XMLSyntaxError, e:
-			print _("Validation failed. XML syntax error: %s.") % e[0]
-			sys.exit(3)
-		except etree.DocumentInvalid:
-			print _("Validation failed. Does not comply with schema.")
-			sys.exit(3)
-		else:
-			print _("Validation succeeded.")
-			return
-	
-	elif options.nofork or os.getuid() == 0: # start GUI
+	if options.nofork or os.getuid() == 0: # start GUI
 		from portato.gui import run
 		from portato.helper import info
 		info("%s v. %s", _("Starting Portato"), VERSION)
-- 
cgit v1.2.3-70-g09d2


From 372c5781ae6723f65bb9e6cea2d719f916d8b265 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Thu, 3 Jul 2008 23:50:00 +0200
Subject: Removed XSD_LOCATION -- as there is no more xsd ;)

---
 portato.py           | 2 +-
 portato/constants.py | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'portato.py')

diff --git a/portato.py b/portato.py
index 69fb792..cea4ad7 100755
--- a/portato.py
+++ b/portato.py
@@ -19,7 +19,7 @@ import gettext, locale
 from optparse import OptionParser, SUPPRESS_HELP
 
 from portato import get_listener
-from portato.constants import VERSION, XSD_LOCATION, LOCALE_DIR, APP, SU_COMMAND
+from portato.constants import VERSION, LOCALE_DIR, APP, SU_COMMAND
 
 def main ():
 	# set gettext stuff
diff --git a/portato/constants.py b/portato/constants.py
index 32f0f9b..93e4240 100644
--- a/portato/constants.py
+++ b/portato/constants.py
@@ -45,8 +45,6 @@ These should be set during the installation.
 @type SETTINGS_DIR: string
 @var TEMPLATE_DIR: Directory containing the UI template files.
 @type TEMPLATE_DIR: string
-@var XSD_LOCATION: Path of the plugin schema.
-@type XSD_LOCATION: string
 """
 import os
 from os.path import join as pjoin
@@ -73,5 +71,3 @@ LOCALE_DIR = "i18n/"
 PLUGIN_DIR = pjoin(DATA_DIR, "plugins/")
 SETTINGS_DIR = pjoin(HOME, "."+APP)
 TEMPLATE_DIR = "portato/gui/templates/"
-
-XSD_LOCATION = pjoin(DATA_DIR, "plugin.xsd")
-- 
cgit v1.2.3-70-g09d2