Server compatibility & relative imports handled properly

GUI/MainWindow5.py

@@ -7,6 +7,8 @@
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
+import os
+GUI_PATH = os.path.realpath(__file__)[0:-14]
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -15,7 +17,7 @@ def setupUi(self, MainWindow):
         MainWindow.setMinimumSize(QtCore.QSize(800, 600))
         MainWindow.setWindowTitle("pyENL")
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("./GUI/imgs/icon.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(GUI_PATH + "imgs/icon.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         MainWindow.setWindowIcon(icon)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")

entrada.py

@@ -3,15 +3,16 @@
 Intérprete de texto
 '''
 import sys
-from .solver import solver
-from .utils import variables, random_lim, variables_string
+import os
+pyENL_path = os.path.realpath(__file__)[0:-10]
+sys.path.append(pyENL_path)
+from solver import solver
+from utils import variables, random_lim, variables_string
 from numpy import inf
 from CoolProp.CoolProp import PropsSI as prop
 from CoolProp.CoolProp import HAPropsSI as haprop
 from time import time
 import optparse
-import os
-pyENL_path = os.path.realpath(__file__)[0:-10]
 from pint import _DEFAULT_REGISTRY as u
 u.load_definitions(pyENL_path + "units.txt")
 sindim = ((1*u.m)/(1*u.m)).units

pyENL.py

@@ -6,24 +6,25 @@
 import sys
 import os
 pyENL_path = os.path.realpath(__file__)[0:-8]
+sys.path.append(pyENL_path)
 import ast
 import subprocess
 import threading
 from PyQt5 import QtCore, uic, QtGui, QtWidgets
 # import qdarkstyle
 # import qdarkgraystyle
-from .utils import *
-from .entrada import pyENL_variable, entradaTexto
-from .translations import translations
+from utils import *
+from entrada import pyENL_variable, entradaTexto
+from translations import translations
 from copy import deepcopy
 from functools import partial
 from zipfile import ZipFile
 import tempfile
-from .expimp import sols2odt, sols2tex
+from expimp import sols2odt, sols2tex
 from pint import _DEFAULT_REGISTRY as u
 u.load_definitions(pyENL_path + "units.txt")
 from CoolProp.CoolProp import FluidsList, get_parameter_index, get_parameter_information, is_trivial_parameter
-from .pyENL_fcns.functions import dicc_coolprop
+from pyENL_fcns.functions import dicc_coolprop
 # Cargar ahora interfaz desde archivo .py haciendo conversión con:
 # $ pyuic4 GUI/MainWindow.ui -o GUI/MainWindow.py
 # Icono: QtWidgets.QPixmap(_fromUtf8("GUI/imgs/icon.png")
@@ -35,9 +36,9 @@
 # Cuando salga error de no convergencia, no mostrar ventana de tiempo de solución
 
 # form_class = uic.loadUiType("GUI/MainWindow.ui")[0]
-from .GUI.MainWindow5 import Ui_MainWindow as form_class
-from .GUI.props import Ui_Dialog as prop_class
-from .GUI.settings import Ui_Dialog as settings_class
+from GUI.MainWindow5 import Ui_MainWindow as form_class
+from GUI.props import Ui_Dialog as prop_class
+from GUI.settings import Ui_Dialog as settings_class
 
 
 def quitaComentarios(eqns):

solver.py

@@ -4,13 +4,15 @@
 import scipy.optimize as opt
 from os.path import realpath
 pyENL_path = realpath(__file__)[0:-9]
+import sys
+sys.path.append(pyENL_path)
 from numpy import *
-from .pyENL_fcns import *
+from pyENL_fcns import *
 ln = log
 log = log10
 import warnings
 from pint import _DEFAULT_REGISTRY as u
-from .utils import variables , bloques
+from utils import variables , bloques
 u.load_definitions(pyENL_path + "units.txt")
 # from time import time as pyENL_time
 
@@ -269,7 +271,7 @@ def solver(pyENL_eqns, pyENL_variables, tol=None, method='hybr'):
     return pyENL_variables, pyENL_residuos, asegura_convergencia
 
 def agregaUnidades(eqn_, pyENL_variables):
-  from .utils import variables, esalfanum
+  from utils import variables, esalfanum
   vars_ = variables(eqn_)
   # TODO
   # Primero ajustar valores numéricos que vienen con unidades:

utils.py

@@ -2,12 +2,14 @@
 import random
 import copy
 import os
+import sys
 pyENL_path = os.path.realpath(__file__)[0:-8]
+sys.path.append(pyENL_path)
 '''
 Utilidades generales para uso de pyENL
 '''
 from numpy import *
-from .pyENL_fcns import *
+from pyENL_fcns import *
 import re
 ln = log
 prop = log  # Solo importa el nombre de la función para comprobación...