Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 15 Oct 2013 08:16:11 +0000 (10:16 +0200)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Tue, 15 Oct 2013 08:16:11 +0000 (10:16 +0200)
Conflicts:
python/community/psi-api/src/com/jetbrains/python/PyNames.java

1  2 
python/psi-api/src/com/jetbrains/python/PyNames.java

index a35b3c3f60c52897dd3ca35bf974203d990c5944,c87f04baf95bf5deac7cd8d4c623c0ec8b2b5f1b..ae6438bd07705d5d40730f8bdec72436adc0a8f1
@@@ -119,8 -119,10 +119,10 @@@ public class PyNames 
    public static final String COLLECTIONS = "collections";
    public static final String COLLECTIONS_NAMEDTUPLE = COLLECTIONS + "." + NAMEDTUPLE;
  
 -
 -  public static final String ABSTRACTMETHOD = "abstractmethod";
 -  public static final String ABSTRACTPROPERTY = "abstractproperty";
+   public static final String FORMAT = "format";
++  
 +  public static final String ABSTRACTMETHOD = "abc.abstractmethod";
 +  public static final String ABSTRACTPROPERTY = "abc.abstractproperty";
  
    public static final String TUPLE = "tuple";
    public static final String SET = "set";