From 58037a39938f38fed45f9a19d1e8c33bf68feda7 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Thu, 23 Jan 2025 08:25:10 +0100 Subject: [PATCH 1/3] Remove Python 2 leftovers --- xsd-fu/python/generateDS/generateDS.html | 7 ------- xsd-fu/python/generateDS/generateDS.py | 4 ---- 2 files changed, 11 deletions(-) diff --git a/xsd-fu/python/generateDS/generateDS.html b/xsd-fu/python/generateDS/generateDS.html index 52c4d0282..9eaf9fc6c 100644 --- a/xsd-fu/python/generateDS/generateDS.html +++ b/xsd-fu/python/generateDS/generateDS.html @@ -2147,13 +2147,6 @@

15   Includes -- The XML script scans your XML Schema document and, recursively, documents that are included looking for include elements; it inserts all content into a single document, which it writes out.

-

Since process_includes.py uses the ElementTree API, in order -to use process_includes.py you will need one of the following:

-

Here are samples of how you might use process_includes.py, if your schema contains include elements.

Example 1:

diff --git a/xsd-fu/python/generateDS/generateDS.py b/xsd-fu/python/generateDS/generateDS.py index 39fb5138e..c1f72de6f 100755 --- a/xsd-fu/python/generateDS/generateDS.py +++ b/xsd-fu/python/generateDS/generateDS.py @@ -85,10 +85,6 @@ -#from __future__ import generators # only needed for Python 2.2 - - - import sys import os.path import time From d83845c6824d8aeed28c676c0dcad0bf9b119efb Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Fri, 24 Jan 2025 11:01:53 +0100 Subject: [PATCH 2/3] Use `in` instead of `has_key` in Python 3 --- xsd-fu/python/generateDS/generateDS.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd-fu/python/generateDS/generateDS.py b/xsd-fu/python/generateDS/generateDS.py index c1f72de6f..0c0a9bc8e 100755 --- a/xsd-fu/python/generateDS/generateDS.py +++ b/xsd-fu/python/generateDS/generateDS.py @@ -901,7 +901,7 @@ def getKeys(self): def add(self, name, attr): self.group[name] = attr def delete(self, name): - if has_key(self.group, name): + if name in self.group: del self.group[name] return 1 else: From 1fd0d959ff65ba2f9269e861f8775eee46e57565 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Fri, 24 Jan 2025 11:31:44 +0100 Subject: [PATCH 3/3] Apply ruff/pyupgrade rule UP009 UP009 UTF-8 encoding declaration is unnecessary --- xsd-fu/python/generateDS/generateDS.html | 2 +- xsd-fu/python/generateDS/process_includes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xsd-fu/python/generateDS/generateDS.html b/xsd-fu/python/generateDS/generateDS.html index 9eaf9fc6c..a5e7af2a7 100644 --- a/xsd-fu/python/generateDS/generateDS.html +++ b/xsd-fu/python/generateDS/generateDS.html @@ -2068,7 +2068,7 @@

13.1   Capturing xs:date

Then, define date_calcs.py as:

 #!/usr/bin/env python
-# -*- mode: pymode; coding: utf-8; -*-
+# -*- mode: pymode; -*-
 
 import datetime
 
diff --git a/xsd-fu/python/generateDS/process_includes.py b/xsd-fu/python/generateDS/process_includes.py
index 39aa58626..7b34b50ae 100755
--- a/xsd-fu/python/generateDS/process_includes.py
+++ b/xsd-fu/python/generateDS/process_includes.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- mode: pymode; coding: utf-8; -*-
+# -*- mode: pymode; -*-
 """
 Synopsis:
     Recursively process the include elements in an XML Schema file.