diff --git a/CenRa_FLUX/tools/resources.py b/CenRa_FLUX/tools/resources.py index 482320f..829c18d 100644 --- a/CenRa_FLUX/tools/resources.py +++ b/CenRa_FLUX/tools/resources.py @@ -155,7 +155,7 @@ def maj_verif(NAME): try: urllib.request.urlopen('https://google.com') binar = True - except NameError: + except urllib.error.URLError: binar = False if binar: try: diff --git a/CenRa_PAGERENDER/tools/resources.py b/CenRa_PAGERENDER/tools/resources.py index bdd8c41..8c7d826 100644 --- a/CenRa_PAGERENDER/tools/resources.py +++ b/CenRa_PAGERENDER/tools/resources.py @@ -147,7 +147,7 @@ def maj_verif(NAME): try: urllib.request.urlopen('https://google.com') binar = True - except urllib.requests.URLError: + except urllib.error.URLError: binar = False if binar: try: diff --git a/CenRa_POSTGIS/CenRa_Postgis.py b/CenRa_POSTGIS/CenRa_Postgis.py index b226a05..3038ab3 100644 --- a/CenRa_POSTGIS/CenRa_Postgis.py +++ b/CenRa_POSTGIS/CenRa_Postgis.py @@ -30,8 +30,7 @@ try: from .postgis_creator import Postgis_Creator from .postgis_rename import Postgis_Rename except NameError: - print('404') - + print('Module introuvable...') IPAddr = socket.gethostbyname(socket.gethostname()) @@ -104,19 +103,13 @@ class PgPostgis: self.postgis_rename = QAction(icon3, 'dossier_rename', None) self.toolBar.addAction(self.postgis_rename) self.postgis_rename.triggered.connect(self.open_rename) + self.postgis_rename.setEnabled(False) + self.postgis_rename.setVisible(0) if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement': - self.action_rename.setEnabled(True) - self.postgis_rename.setEnabled(True) + if os.access('N:/', os.R_OK): + self.postgis_rename.setEnabled(True) self.postgis_rename.setVisible(1) - else: - self.action_rename.setEnabled(False) - self.postgis_rename.setEnabled(False) - self.postgis_rename.setVisible(0) - - self.postgis_rename.setEnabled(False) - if os.access('N:/', os.R_OK): - self.postgis_rename.setEnabled(True) def open_about_dialog(self): """ diff --git a/CenRa_POSTGIS/postgis_rename.py b/CenRa_POSTGIS/postgis_rename.py index 7351404..68a3098 100644 --- a/CenRa_POSTGIS/postgis_rename.py +++ b/CenRa_POSTGIS/postgis_rename.py @@ -48,8 +48,8 @@ try: dbname = account[4] cur = account[7] con = account[8] -except ValueError: - print('') +except NameError: + print('Fails to login DB for account') class Postgis_Rename(QDialog, EDITOR_CLASS): diff --git a/CenRa_POSTGIS/tools/resources.py b/CenRa_POSTGIS/tools/resources.py index 6eb675d..5ffa72d 100644 --- a/CenRa_POSTGIS/tools/resources.py +++ b/CenRa_POSTGIS/tools/resources.py @@ -156,7 +156,7 @@ def maj_verif(NAME): # url = qgis.utils.pluginMetadata(NAME, 'repository') # URL = url+'/raw/branch/main/plugins.xml' URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml' -# print(URL) + # print(URL) version = qgis.utils.pluginMetadata(NAME, 'version') len_version = len(version) try: @@ -169,10 +169,10 @@ def maj_verif(NAME): version_web = str(urllib.request.urlopen(URL).read()) plugin_num = version_web.find(NAME) valeur_version_web = version_web.find('', plugin_num) + 9 - version_plugin = version_web[valeur_version_web:valeur_version_web + len_version] + version_plugin = version_web[valeur_version_web: valeur_version_web + len_version] if version_plugin != version: iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30) - except urllib.error.URLError: + except NameError: print("error gitea version ssl") else: iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)