Merge branch 'dev' of github.com:davidhalter/jedi into docrtypes

test/completion/__init__.py

@@ -0,0 +1,3 @@
+""" needed for some modules to test against packages. """
+
+some_variable = 1

test/completion/goto.py

@@ -115,6 +115,12 @@ mod1.a
 #! ['a=1.0']
 from import_tree.pkg.mod1 import a
 
+#! ['import os']
+from .imports import os
+
+#! ['some_variable=1']
+from . import some_variable
+
 # -----------------
 # anonymous classes
 # -----------------

test/completion/imports.py

@@ -175,6 +175,13 @@ mod1.
 #? str()
 imp_tree.a
 
+#? ['some_variable']
+from . import some_variable
+#? ['arrays']
+from . import arrays
+#? []
+from . import import_tree as ren
+
 
 # -----------------
 # special positions -> edge cases