Add class for windows version checking #210

topic2k · 2017-03-05T09:54:33Z

replaces #208
based on the idea from @kdschlosser, extended to a class with compare functions.

Check for a specific Windows version:
eg.WindowsVersion.IsVista() or eg.WindowsVersion == "Vista"

Check for a minimum Windows version:
eg.WindowsVersion >= "Vista"

Notice for plugin developers: eg.Utils.IsXP() and eg.Utils.IsVista() are now deprecated.

Functions:

IsXP()
IsVista()
Is7()
Is8()
Is80()
Is81()
Is10()

Comparison:

eg.WindowsVersion [<|<=|==|!=|>=|>] "[XP|Vista|7|8|80|81|10]"

XP:    Windows XP
       Windows Server 2003
       Windows 2003 R2
       Windows Tablet PC
       Windows Media Center Edition 2002
       Windows Media Center Edition 2004
       Windows Media Center Edition 2005
Vista: Windows Vista
       Windows Server 2008
7:     Windows 7
       Windows Server 2008 R2
8:     (80 and 81)
80:    Windows 8
       Windows Server 2012
       Windows RT
81:    Windows 8.1
       Windows 2012 R2
       Windows RT 8.1
10:    Windows 10
       Windows Server 2016

Adds a simple way to grab the windows version. eg.WindowsVersion.IsXp() eg.WindowsVersion.IsVista() eg.WindowsVersion.Is7() eg.WindowsVersion.is8() eg.WindowsVersion.Is10() This is going to be used by the Systemn.PowerBroadcastNotifier and also System.DeviceChangeNotifier (if the PR for the latter gets accepted)

kdschlosser

Just a couple of formatting changes. And constructing the WindowsVersion object. But it runs perfect as far as i can tell. sweet upgrade 👍 👏

kdschlosser · 2017-03-05T16:43:09Z

eg/Classes/WindowsVersion.py

+
+    def __eq__(self, other):
+        self.check_os_value(other)
+        return getattr(self, 'Is'+other)()


Formatting:

return getattr(self, 'Is' + other)()

kdschlosser · 2017-03-05T16:43:55Z

eg/Classes/WindowsVersion.py

+    def __gt__(self, other):
+        self.check_os_value(other)
+        if other == 'XP':
+            return self.THIS >self. WIN_XP32 and self.THIS >self. WIN_XP64


Formatting:

return self.THIS > self.WIN_XP32 and self.THIS > self.WIN_XP64

kdschlosser · 2017-03-05T16:44:33Z

eg/Classes/WindowsVersion.py

+        if other == 'XP':
+            return self.THIS >self. WIN_XP32 and self.THIS >self. WIN_XP64
+        if other == '8':
+            return self.THIS >self. WIN_80 and self.THIS >self. WIN_81


Formatting:

return self.THIS > self.WIN_80 and self.THIS > self.WIN_81

kdschlosser · 2017-03-05T16:45:20Z

eg/Classes/WindowsVersion.py

+    def __lt__(self, other):
+        self.check_os_value(other)
+        if other == 'XP':
+            return self.THIS <self. WIN_XP32 and self.THIS <self. WIN_XP64


Formatting:

return self.THIS < self.WIN_XP32 and self.THIS < self.WIN_XP64

kdschlosser · 2017-03-05T16:46:13Z

eg/Classes/WindowsVersion.py

+        if other == 'XP':
+            return self.THIS <self. WIN_XP32 and self.THIS <self. WIN_XP64
+        if other == '8':
+            return self.THIS <self. WIN_80 and self.THIS <self. WIN_81


Formatting:

return self.THIS < self.WIN_80 and self.THIS < self.WIN_81

kdschlosser · 2017-03-05T16:48:04Z

eg/Classes/WindowsVersion.py

+        :return: Bool
+        """
+        return (
+            self.THIS == self. WIN_80 or


Formatting:

self.THIS == self.WIN_80 or

kdschlosser · 2017-03-05T16:48:28Z

eg/Classes/WindowsVersion.py

+        """
+        return (
+            self.THIS == self. WIN_80 or
+            self.THIS == self. WIN_81


Formatting:

self.THIS == self.WIN_81

kdschlosser · 2017-03-05T16:48:45Z

eg/Classes/WindowsVersion.py

+
+        :return: Bool
+        """
+        return self.THIS == self. WIN_80


Formatting:

return self.THIS == self.WIN_80

kdschlosser · 2017-03-05T16:49:05Z

eg/Classes/WindowsVersion.py

+
+        :return: Bool
+        """
+        return self.THIS == self. WIN_81


Formatting:

return self.THIS == self.WIN_81

kdschlosser · 2017-03-05T16:49:21Z

eg/Classes/WindowsVersion.py

+
+        :return: Bool
+        """
+        return self.THIS == self. WIN_10


Formatting:

return self.THIS == self.WIN_10

Construct WindowsVersion

WindowsVersion = WindowsVersion()

kdschlosser · 2017-03-05T19:59:26Z

I made some changes and and did a commit to my PR of this. it only has one issue with a docstring. and not sure as to how to clean that up to make it green. but take a look see if it's something you like then keep it. if not no worries.. the one i did also doesn't care if you do

eg.WindowsVersion >= 'xp'

instead of

eg.WindowsVersion >= 'XP'

kdschlosser · 2017-03-09T04:03:40Z

the only thing i see which i do not understand is this

setattr(eg, "WindowsVersion", eg.WindowsVersion)

But i am thinking it has something to do with the build process and the docs.

you could do from Classes.WindowsVersion import WindowsVersion and this can be placed in the eg_init_.py file at the top. only if you aren't using

import eg

at the module level

but i am thinking that maybe some adjustment to the doc creation in the build process is really what is needed,

kdschlosser · 2017-03-09T16:26:33Z

eg/Classes/WindowsVersion.py

+    |           | Windows Media Center Edition 2004, |
+    |           | Windows Media Center Edition 2005  |
+    +-----------+------------------------------------+
+    | ``XP64``  | Windows Server 2003,               |


you need to add a line in here

| | Windows XP Professional |

I am also not sure how you want to handle the Windows 2003 R2

you can Either change it to read Windows Server 2003 R2
or remove it since all R2 is, is a repackaged Server 2003 with SP1 slip streamed..
so technically it is Server 2003 SP1

kdschlosser · 2017-03-10T15:24:26Z

does doing the import in the init take care of satisfying the building of the docs?? It's a step in the right direction for getting rid of the dynamic module. and it will also make IDE's happy

topic2k · 2017-03-10T15:26:56Z

Yes, it works. At the first steps i wasn't able to get class docs into the help file. I used ActionBase as an example. That's why i had that setattr() there. So if, you have nothing more to comment, i will merge it in a few minutes. 😃

kdschlosser · 2017-03-10T15:28:36Z

i'm good to go.. it looks great! I know it was something simple turned into an animal LOL but it helped us to get a system together for what i think should be a model for new additions to EG.

kdschlosser · 2017-03-10T15:32:21Z

and i personally do not understand the eg.ActionClass eg.ActionBase thing.. I believe that was done for backwards compatibility with an earlier version of EG and eg.ActionClass was supposed to be depreciated.. but it didn't happen same goes for eg.PluginClass

Reworked the compare functions (based on kdschlosser's idea) added more docstrings and layout the class docstring. added the class to help file (Developer documentation -> The eg module)

only show deprecation warning for eg

replace `eg.Utils.IsXP()` with `eg.WindowsVersion.IsXP()`

topic2k added the enhancement label Mar 5, 2017

topic2k requested a review from kdschlosser March 5, 2017 09:54

kdschlosser requested changes Mar 5, 2017

View reviewed changes

topic2k force-pushed the enhancement-windows-version branch 2 times, most recently from b7a572d to da362de Compare March 8, 2017 19:16

topic2k added the notice label Mar 8, 2017

kdschlosser approved these changes Mar 9, 2017

View reviewed changes

kdschlosser reviewed Mar 9, 2017

View reviewed changes

topic2k added 8 commits March 10, 2017 16:34

Convert to class and add comparison functions.

a639236

Reworked the compare functions (based on kdschlosser's idea) added more docstrings and layout the class docstring. added the class to help file (Developer documentation -> The eg module)

deprecate eg.Utils.IsXP() and eg.Utils.IsVista()

f39a7b7

only show deprecation warning for eg

replace eg.Utils.IsVista() with eg.WindowsVersion.IsVista()

e09cae1

replace eg.Utils.IsVista() with eg.WindowsVersion.IsVista()

3991366

replace eg.Utils.IsVista() with eg.WindowsVersion.IsVista()

2c637d8

replace eg.Utils.IsVista() with eg.WindowsVersion.IsVista()

b50e103

replace eg.Utils.IsVista() with eg.WindowsVersion.IsVista()

fa0d718

replace `eg.Utils.IsXP()` with `eg.WindowsVersion.IsXP()`

replace eg.Utils.IsVista() with eg.WindowsVersion.IsVista()

e6668da

topic2k force-pushed the enhancement-windows-version branch from b4f061a to e6668da Compare March 10, 2017 15:35

topic2k merged commit d9a817e into EventGhost:master Mar 10, 2017

topic2k deleted the enhancement-windows-version branch March 10, 2017 15:42

topic2k mentioned this pull request Mar 25, 2017

WindowsVersion, Fixes issue with help #215

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add class for windows version checking #210

Add class for windows version checking #210

topic2k commented Mar 5, 2017 •

edited

kdschlosser left a comment

kdschlosser Mar 5, 2017 •

edited

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser Mar 5, 2017

kdschlosser commented Mar 5, 2017 •

edited

kdschlosser commented Mar 9, 2017

kdschlosser Mar 9, 2017

kdschlosser Mar 9, 2017

kdschlosser commented Mar 10, 2017

topic2k commented Mar 10, 2017

kdschlosser commented Mar 10, 2017

kdschlosser commented Mar 10, 2017

Add class for windows version checking #210

Add class for windows version checking #210

Conversation

topic2k commented Mar 5, 2017 • edited

kdschlosser left a comment

Choose a reason for hiding this comment

kdschlosser Mar 5, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kdschlosser commented Mar 5, 2017 • edited

kdschlosser commented Mar 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kdschlosser commented Mar 10, 2017

topic2k commented Mar 10, 2017

kdschlosser commented Mar 10, 2017

kdschlosser commented Mar 10, 2017

topic2k commented Mar 5, 2017 •

edited

kdschlosser Mar 5, 2017 •

edited

kdschlosser commented Mar 5, 2017 •

edited