Merge pull request #180 from capocchi/version-4.0

bug fix

Author: capocchi

Components.py

@@ -909,7 +909,7 @@ def GetModule(filename):
 
 				### try to import module
 				try:
-					module = spec.loader.load_module()
+					module = spec.loader.load_module(module_name)
 				except (ValueError, ImportError) as msg:
 					sys.stderr.write(_("Module %s not imported from %s: %s!\n"%(module_name,dir_name,str(msg))))
 					module = sys.exc_info()

Container.py

@@ -3072,10 +3072,14 @@ def GetTestFile(self):
 
 	# NOTE: Testable :: isAMD 				=> Test if the model is an AMD and if it's well-formed
 	def isAMD(self):
-		return zipfile.is_zipfile(os.path.dirname(self.python_path))
+		fn = os.path.dirname(self.python_path)
+		return zipfile.is_zipfile(fn) or fn.endswith(('.amd','.cmd')) if os.path.isfile(fn) else False
 
 	def isPYC(self):
-		return self.python_path.endswith('.pyc')
+		return self.python_path.endswith('.pyc') if os.path.isfile(self.python_path) else False
+
+	def isPY(self):
+		return self.python_path.endswith('.py') if os.path.isfile(self.python_path) else False
 
 	# NOTE: Testable :: CreateTestsFiles	=> AMD tests files creation
 	def CreateTestsFiles(self):
@@ -3763,14 +3767,22 @@ def __setstate__(self, state):
 
 			### for .cmd or .amd
 			else:
-				pass
-				#with zipfile.ZipFile(model_path) as zf:
-				#	### find all python files
-				#	for file in zf.namelist():
-				#		r = repr(zf.read(file))
-				#		if file.endswith(".py") and ('DomainBehavior' in r or 'DomainStructure' in r):
-				#			#state['python_path'] = os.path.join(model_path, os.path.basename(model_path).replace('.amd','.py').replace('.cmd','.py'))
-				#			state['bad_filename_path_flag'] =  file != state['python_path'] 
+				if not os.path.exists(model_path) :
+					state['bad_filename_path_flag'] = True
+				# else:
+				# 	with zipfile.ZipFile(model_path) as zf:
+				# 		### find all python files
+				# 		for file in zf.namelist():
+				# 			path =  os.path.join(model_path, os.path.basename(model_path).replace('.amd','.py').replace('.cmd','.py'))
+				# 			#cls = GetClass(path)
+				# 			if file.endswith(".py"):# and (issubclass(cls, DomainBehavior) or issubclass(cls, DomainStructure)):
+				# 				if os.path.exists(model_path):
+				# 					state['python_path'] = path
+				# 				else:
+				# 					state['bad_filename_path_flag'] = True
+								#state['python_path'] = os.path.join(model_path, os.path.basename(model_path).replace('.amd','.py').replace('.cmd','.py'))
+								#state['bad_filename_path_flag'] =  file != state['python_path'] 
+							
 
 		### if the fileName attribut dont exist, we define it into the current devsimpy directory (then the user can change it from Property panel)
 		if 'args' in state:

Menu.py

@@ -1018,12 +1018,12 @@ def __init__(self, shape, event):
 		else:
 
 			if isinstance(shape, Container.CodeBlock) and shape.isAMD():
-				Edit_menu = AppendMenu(self, -1, _("Edit"), edit_subMenu)
-				Edit_SubMenu1 = edit_subMenu.AppendItem(editModel)
-				Edit_SubMenu2 = edit_subMenu.AppendItem(editTest)
+					Edit_menu = AppendMenu(self, -1, _("Edit"), edit_subMenu)
+					Edit_SubMenu1 = edit_subMenu.AppendItem(editModel)
+					Edit_SubMenu2 = edit_subMenu.AppendItem(editTest)
 			else:
 				Edit_menu = AppendItem(edit)
-
+				
 			if isinstance(shape, Container.CodeBlock) and shape.isPYC():
 				Edit_menu.Enable(False)
 
@@ -1147,8 +1147,10 @@ def __init__(self, shape, event):
 				# AMD specific binding
 				if shape.isAMD():
 				 	self.__canvas.Bind(wx.EVT_MENU, shape.OnTestEditor, id=ID_TESTING_SHAPE)
-				else:
+				elif shape.isPY():
 					self.__canvas.Bind(wx.EVT_MENU, shape.OnEditor, id=ID_EDIT_SHAPE)
+				else:
+					self.Enable(ID_EDIT_SHAPE, False)
 
 			# ContainerBlock specific binding
 			elif isinstance(shape, Container.ContainerBlock):