Manage going up in packages for relative imports

src/Famix-Python-Importer-Tests/FamixPythonProject1Test.class.st

@@ -476,6 +476,19 @@ FamixPythonProject1Test >> testModuleImportsGlobalVariableFromAModule [
 	self assert: import importedEntity equals: global
 ]
 
+{ #category : 'tests - from-import relative' }
+FamixPythonProject1Test >> testModuleImportsGlobalVariableFromAModuleInAPackageOneLevelHigherRelatively [
+
+	| module global import |
+	self denyEmpty: self model allImports.
+	module := self moduleNamed: 'moduleInSubPackage3'.
+	global := self globalVariableNamed: 'moduleInRoot3Variable'.
+	import := module outgoingImports detect: [ :pimport | pimport target name = 'moduleInRoot3Variable' ].
+
+	self assert: import importingEntity equals: module.
+	self assert: import importedEntity equals: global
+]
+
 { #category : 'tests - from-import relative' }
 FamixPythonProject1Test >> testModuleImportsGlobalVariableFromAModuleInASubpackageRelatively [
 

src/Famix-Python-Importer/FamixPythonFromImportResolvable.class.st

@@ -93,10 +93,12 @@ FamixPythonFromImportResolvable >> resolveInScope: aScope currentEntity: current
 FamixPythonFromImportResolvable >> resolveRelativePathFor: currentEntity [
 
 	| possibleEntities splittedPath |
-	self flag: #todo. "manage ..  And chaining of submodules and also spaces after dots"
-
-	possibleEntities := currentEntity parentPackage children.
-	splittedPath := path allButFirst.
+	splittedPath := path.
+	possibleEntities := currentEntity.
+	[ splittedPath beginsWith: '.' ] whileTrue: [
+		possibleEntities := possibleEntities parentPackage.
+		splittedPath := splittedPath allButFirst ].
+	possibleEntities := possibleEntities children.
 	splittedPath := splittedPath splitOn: $..
 	possibleEntities := possibleEntities select: [ :possibleEntity | possibleEntity name = splittedPath first ].
 	splittedPath removeFirst.