MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Ekaterina Tuzova
2011-06-27 22:35:48 +04:00
parent 8bca8707c4 10ca0aa4e7
commit ba2878e50a
4 changed files with 89 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/generator3.py
+53 -37
View File
@@ -24,7 +24,7 @@ but seemingly no one uses them in C extensions yet anyway.
# * re.search-bound, ~30% time, in likes of builtins and _gtk with complex docstrings.
# None of this can seemingly be easily helped. Maybe there's a simpler and faster parser library?
VERSION = "1.93" # Must be a number-dot-number string, updated with each change that affects generated skeletons
VERSION = "1.94" # Must be a number-dot-number string, updated with each change that affects generated skeletons
# Note: DON'T FORGET TO UPDATE!
import sys
@@ -1037,24 +1037,33 @@ class ModuleRedeclarator(object):
# We list all such Ys keyed by X, all fully-qualified names:
# {"real_definer_module": ("fake_reexporter_module",..)}
KNOWN_FAKE_REEXPORTERS = {
"gtk._gtk": ('gtk',),
"gobject._gobject": ('gobject',),
"numpy.core.multiarray": ('numpy', 'numpy.core'),
"numpy.core._dotblas": ('numpy', 'numpy.core'),
"numpy.core.umath": ('numpy', 'numpy.core'),
bin_collections_name: ('collections',),
"_functools": ('functools',),
"_socket": ('socket',), # .error, etc
"gnomecanvas": ("gnome.canvas",),
"pyexpat": ('xml.parsers.expat',),
"_bsddb": ('bsddb.db',),
"pysqlite2._sqlite": ('pysqlite2.dbapi2',), # errors
"numpy.core.multiarray": ('numpy', 'numpy.core'),
"numpy.core._dotblas": ('numpy', 'numpy.core'),
"numpy.core.umath": ('numpy', 'numpy.core'),
"gtk._gtk": ('gtk', 'gtk.gdk',),
"gobject._gobject": ('gobject',),
"gnomecanvas": ("gnome.canvas",),
}
# names that look genuinely exported but aren't.
# e.g. 'xml.parsers.expat.ExpatError' is actually defined in pyexpat, and xml.parsers.expat imports it from there.
# {'qualified_purported_module': ('name',..)}
KNOWN_FAKE_EXPORTS = {
# 'xml.parsers.expat': ('ExpatError', 'error'),
}
KNOWN_FAKE_BASES = []
# list of classes that pretend to be base classes but are mere wrappers, and their defining modules
# [(class, module),...] -- real objects, not names
try:
import sip as sip_module # Qt specifically likes it
if hasattr(sip_module, 'wrapper'):
KNOWN_FAKE_BASES.append((sip_module.wrapper, sip_module))
if hasattr(sip_module, 'simplewrapper'):
KNOWN_FAKE_BASES.append((sip_module.simplewrapper, sip_module))
del sip_module
except:
pass
# Some builtin classes effectively change __init__ signature without overriding it.
# This callable serves as a placeholder to be replaced via REDEFINED_BUILTIN_SIGS
@@ -1625,11 +1634,17 @@ class ModuleRedeclarator(object):
seen[p_class] = p_name
bases = getBases(p_class)
base_def = ""
skipped_bases = []
if bases:
skip_qualifiers = [p_modname, BUILTIN_MOD_NAME, 'exceptions']
skip_qualifiers.extend(self.KNOWN_FAKE_REEXPORTERS.get(p_modname, ()))
bases_list = [] # what we'll render in the class decl
for base in bases: # somehow import every base class
for base in bases:
if [1 for (cls, mdl) in self.KNOWN_FAKE_BASES if cls == base and mdl != self.module]:
# our base is a wrapper and our module is not its defining module
skipped_bases.append(str(base))
continue
# somehow import every base class
base_name = base.__name__
qual_module_name = self.qualifierOf(base, skip_qualifiers)
got_existing_import = False
@@ -1646,20 +1661,19 @@ class ModuleRedeclarator(object):
else:
bases_list.append(base_name)
base_def = "(" + ", ".join(bases_list) + ")"
out(indent, "class ", p_name, base_def, ":")
out(indent, "class ", p_name, base_def, ":", skipped_bases and " # skipped bases: " + ", ".join(skipped_bases) or "")
self.outDocAttr(out, p_class, indent + 1)
# inner parts
methods = {}
properties = {}
others = {}
we_are_the_base_class = p_modname == BUILTIN_MOD_NAME and p_name == "object"
has_dict = hasattr(p_class, "__dict__")
if has_dict:
field_source = p_class.__dict__
else:
field_source = dir(p_class) # this includes unwanted inherited methods, but no dict + inheritance is rare
try:
field_keys = field_source.keys() # Jython 2.5.1 _codecs fail here
if hasattr(p_class, "__dict__"):
field_source = p_class.__dict__
field_keys = field_source.keys() # Jython 2.5.1 _codecs fail here
else:
field_keys = dir(p_class) # this includes unwanted inherited methods, but no dict + inheritance is rare
except:
field_keys = ()
for item_name in field_keys:
@@ -1810,8 +1824,8 @@ class ModuleRedeclarator(object):
vars_complex = {}
funcs = {}
classes = {}
our_package = packageOf(p_name)
for item_name in self.module.__dict__:
note("looking at %s", item_name)
if item_name in ("__dict__", "__doc__", "__module__", "__file__", "__name__", "__builtins__", "__package__"):
continue # handled otherwise
try:
@@ -1831,20 +1845,23 @@ class ModuleRedeclarator(object):
mod_name = getattr(item, '__module__', None)
except:
pass
import_from_top = our_package.startswith(packageOf(mod_name, True)) # e.g. p_name="pygame.rect" and mod_name="pygame"
# we assume that module foo.bar never imports foo; foo may import foo.bar. (see pygame and pygame.rect)
maybe_import_mod_name = mod_name or ""
import_is_from_top = len(p_name) > len(maybe_import_mod_name) and p_name.startswith(maybe_import_mod_name)
note("mod_name = %s, prospective = %s, from top = %s", mod_name, maybe_import_mod_name, import_is_from_top)
want_to_import = False
if (mod_name
and mod_name != BUILTIN_MOD_NAME
and mod_name != p_name
and mod_name not in surely_not_imported_mods
and not import_from_top
and not import_is_from_top
):
# import looks valid, but maybe it's a .py file? we're certain not to import from .py
# e.g. this rules out _collections import collections and builtins import site.
try:
imported = __import__(mod_name) # ok to repeat, Python caches for us
if imported:
qualifieds = name.split(".")[1:]
qualifieds = mod_name.split(".")[1:]
for qual in qualifieds:
imported = getattr(imported, qual, None)
if not imported:
@@ -2080,19 +2097,18 @@ def redoModule(name, out_name, mod_file_name, doing_builtins, imported_module_na
# fails to find 'gobject._gobject'. thus we need to pull the module directly out of
# sys.modules
mod = sys.modules[name]
if not mod:
if mod:
action("opening %r", out_name)
outfile = fopen(out_name, "w")
action("restoring")
r = ModuleRedeclarator(mod, outfile, mod_file_name, doing_builtins=doing_builtins)
r.redo(name, imported_module_names)
action("flushing")
r.flush()
action("closing %r", out_name)
outfile.close()
else:
report("Failed to find imported module in sys.modules")
#sys.exit(0)
action("opening %r", out_name)
outfile = fopen(out_name, "w")
action("restoring")
r = ModuleRedeclarator(mod, outfile, mod_file_name, doing_builtins=doing_builtins)
r.redo(name, imported_module_names)
action("flushing")
r.flush()
action("closing %r", out_name)
outfile.close()
# find_binaries functionality
python/helpers/required_gen_version
+27 -6
View File
@@ -9,13 +9,34 @@
(built-in) 1.93 # skeletons of all built-in modules are built together
# Note: modules like itertools, etc are "(built-in)" and are ignored if given separately
# pygame._numericsndarray 1.81
PyQt4.Qsci 1.94
PyQt4.QtAssistant 1.94
PyQt4.QtCore 1.94
PyQt4.QtDesigner 1.94
PyQt4.QtGui 1.94
PyQt4.QtHelp 1.94
PyQt4.QtNetwork 1.94
PyQt4.QtScriptTools 1.94
PyQt4.QtScript 1.94
PyQt4.QtSvg 1.94
PyQt4.QtTest 1.94
PyQt4.Qt 1.94
PyQt4.QtWebKit 1.94
PyQt4.QtXmlPatterns 1.94
PyQt4.QtXml 1.94
pygame.fastevent 1.94
pygame.image 1.94
sip 1.94
pysqlite2._sqlite 1.94
_bsddb 1.94
h5py.h5 1.94
h5py.h5i 1.94
h5py.h5g 1.94
#numpy 0.9 # older than default is ok
#numpy.core 1.2
#numpy.core.multiarray 1.2
#numpy.random 1.3
#pygame.rect 1.4
python/pluginSrc/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
+2 -1
View File
@@ -102,7 +102,8 @@ public class PyPluginCommonOptionsForm implements AbstractPyCommonOptionsForm {
final List<Sdk> allSdks = PythonSdkType.getAllSdks();
Sdk selection = null;
for (Sdk sdk : allSdks) {
if (FileUtil.pathsEqual(sdk.getHomePath(), sdkHome)) selection = sdk;
String homePath = sdk.getHomePath();
if (homePath != null && FileUtil.pathsEqual(homePath, sdkHome)) selection = sdk;
sdkList.add(sdk);
}
python/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java
+7 -2
View File
@@ -17,12 +17,14 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.RefactoringFactory;
import com.intellij.refactoring.extractMethod.AbstractExtractMethodDialog;
import com.intellij.refactoring.extractMethod.AbstractVariableData;
import com.intellij.refactoring.extractMethod.ExtractMethodDecorator;
import com.intellij.refactoring.extractMethod.ExtractMethodValidator;
import com.intellij.refactoring.listeners.RefactoringElementListenerComposite;
import com.intellij.refactoring.rename.RenameUtil;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.Function;
import com.intellij.util.containers.hash.HashMap;
import com.jetbrains.python.PyBundle;
@@ -281,7 +283,10 @@ public class PyExtractMethodUtil {
final String name = parameter.getName();
final String newName = map.get(name);
if (name != null && newName != null && !name.equals(newName)){
RefactoringFactory.getInstance(project).createRename(parameter, newName).run();
Map<PsiElement, String> allRenames = new java.util.HashMap<PsiElement, String>();
allRenames.put(parameter, newName);
UsageInfo[] usages = RenameUtil.findUsages(parameter, newName, false, false, allRenames);
RenameUtil.doRename(parameter, newName, usages, project, new RefactoringElementListenerComposite());
}
}
// Change signature according to pass settings and