Skip to content

Commit 0ec45d8

Browse files
pnhofmannpnhofmann
authored and
pnhofmann
committed
Make Jarvis ready for python 3.8
* SyntaxError: Compare string with == on multiple occurrences * Use distro.name() instead platform.dist() because removed
1 parent e1551e2 commit 0ec45d8

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

jarviscli/plugin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def run(self, jarvis, s):
203203
"""Entry point if this plugin is called"""
204204
sub_command = jarvis.find_action(s, self.get_plugins().keys())
205205

206-
if sub_command is "None":
206+
if sub_command == "None":
207207
# run default
208208
if self.is_callable_plugin():
209209
self._backend[0](jarvis.get_api(), s)

jarviscli/plugins/movie.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def movie_search(jarvis, movie):
182182
input_id = jarvis.input()
183183

184184
# If nothing is entered, just return
185-
if input_id is '':
185+
if input_id == '':
186186
return None
187187
if len(input_id) != 1:
188188
return jarvis.say(Fore.RED + 'Please enter valid value')

jarviscli/plugins/systemOptions.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
2-
from platform import architecture, dist, release, mac_ver
2+
from platform import architecture, release, mac_ver
33
from platform import system as sys
4+
import distro
45
from colorama import Fore, Style
56
from plugin import LINUX, UNIX, MACOS, WINDOWS, plugin, require
67

@@ -32,7 +33,7 @@ def Os__MAC(jarvis, s):
3233
jarvis.say('[*] Kernel Release Version: ' + release(), Fore.GREEN)
3334
jarvis.say('[*] macOS System version: ' + mac_ver()[0], Fore.GREEN)
3435
for _ in architecture():
35-
if _ is not '':
36+
if _ != '':
3637
jarvis.say('[*] ' + _, Fore.GREEN)
3738

3839

@@ -43,7 +44,7 @@ def Os__LINUX(jarvis, s):
4344
jarvis.say('[!] Operating System Information', Fore.BLUE)
4445
jarvis.say('[*] ' + sys(), Fore.GREEN)
4546
jarvis.say('[*] ' + release(), Fore.GREEN)
46-
jarvis.say('[*] ' + dist()[0], Fore.GREEN)
47+
jarvis.say('[*] ' + distro.name(), Fore.GREEN)
4748
for _ in architecture():
4849
jarvis.say('[*] ' + _, Fore.GREEN)
4950

0 commit comments

Comments
 (0)