Changes for compatibility with Python 2 (7c77b38f) · Commits · Shriwise, Patrick / PyGriffin

pygriffin/init.py

+1 −2

Original line number	Diff line number	Diff line
		__version__ = '0.0.1'

		from pygriffin.config import *
		from pygriffin.pygriffin import *
		from .pygriffin import *

+9 −10

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@ try:
		except ImportError:
		from configparser import ConfigParser

		import pygriffin.checkvalue as cv
		from . import checkvalue as cv

		"""
		Module for resolving configuation variables of PyGriffin
		"""

		class PyGriffinConfig():
		class PyGriffinConfig:
		"""
		Class to manage PyGriffin's configuration

		@@ -32,7 +32,7 @@ class PyGriffinConfig():
		# always read the config file,
		# even if we don't use it
		self.__config = ConfigParser()
		self.__config.read(self._RC_FILE)
		self.__config.read(str(self._RC_FILE))

		self._griffin_exec = None
		self._isoxml_exec = None
		@@ -107,7 +107,6 @@ class PyGriffinConfig():
		self.mpi_enabled = True
		return


		out = subprocess.Popen([libmesh_config, '--cxx'], stdout=subprocess.PIPE)

		libmesh_config_out = out.stdout.read()
		@@ -135,23 +134,23 @@ class PyGriffinConfig():

		@mpi_enabled.setter
		def mpi_enabled(self, val):
		cv.check_type('MPI Enabled', val, bool)
		cv.check_type('MPI enabled', val, bool)
		self._mpi_enabled = val

		@griffin_exec.setter
		def griffin_exec(self, exec):
		def griffin_exec(self, val):
		self._griffin_exec = cv.check_file('Griffin executable path',
		exec,
		val,
		must_exist=True)

		@isoxml_exec.setter
		def isoxml_exec(self, exec):
		def isoxml_exec(self, val):
		self._isoxml_exec = cv.check_file('ISOXML exectuable path',
		exec,
		val,
		must_exist=True)
		@property
		def module_path(self):
		return config.__MOD_PATH
		return self.__MOD_PATH

		@property
		def rc_file(self):

+3 −4

Original line number	Diff line number	Diff line
		from numbers import Integral
		from pathlib import Path
		import subprocess
		from tkinter import E
		from typing import Iterable
		from collections import Iterable
		import warnings

		import pygriffin.checkvalue as cv
		from pygriffin.config import PyGriffinConfig
		from . import checkvalue as cv
		from .config import PyGriffinConfig

		class PyGriffin:
		"""