Merge pull request beeware#387 from freakboy3742/master

Candidate for 0.1.2 release
mohit0749 · Mar 5, 2017 · db7bb32 · db7bb32
2 parents f5dbce8 + c6a5dd0
commit db7bb32
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -4,7 +4,7 @@
   </description>
 
   <property environment="env"/>
-  <property name="release" value="2"/>
+  <property name="release" value="3"/>
   <exec executable="python" outputProperty="python-version">
     <arg value="-c"/>
     <arg value="import sys; print('.'.join(sys.version.split('.',3)[:2]))"/>

diff --git a/python/common/org/python/types/Str.java b/python/common/org/python/types/Str.java
@@ -319,7 +319,7 @@ public org.python.Object __getitem__(org.python.Object index) {
         __doc__ = ""
     )
     public org.python.Iterable __iter__() {
-        java.util.List<org.python.Object> listOfStrs = new ArrayList<>();
+        java.util.List<org.python.Object> listOfStrs = new java.util.ArrayList<org.python.Object>();
         for (int i = 0; i < this.value.length(); i++) {
             listOfStrs.add(new Str(this.value.substring(i, i + 1)));
         }
@@ -566,7 +566,7 @@ public org.python.Object center(org.python.Object width, org.python.Object charT
         } else {
             throw new org.python.exceptions.TypeError("Fill char must of type String");
         }
-        
+
         if (width instanceof org.python.types.Int) {
             String str = this.value;
             int widthVal = (int)((org.python.types.Int)width).value;
@@ -577,9 +577,9 @@ public org.python.Object center(org.python.Object width, org.python.Object charT
                 int diff = widthVal - strLen;
                 int lenFirst = (diff)/2;
                 int lenSecond = diff - lenFirst;
-                
+
                 java.lang.StringBuffer returnString = new java.lang.StringBuffer(widthVal);
-                
+
                 for (int i = 0; i < lenFirst; i++) {
                     returnString.append(fillChar);
                 }

diff --git a/voc/__init__.py b/voc/__init__.py
@@ -6,4 +6,4 @@
 # __version__ = '1.2.3'       # Final Release
 # __version__ = '1.2.3.post1' # Post Release 1
 
-__version__ = '0.1.1'
+__version__ = '0.1.2'
diff --git a/voc/java/attributes.py b/voc/java/attributes.py
@@ -1414,7 +1414,7 @@ def read_info(reader, dump=None):
 
         for i in range(0, n_classes):
             c1 = reader.read_u2()
-            inner_class = reader.constant_pool[c1].name.string
+            inner_class = reader.constant_pool[c1].name.value
             if dump is not None:
                 reader.debug("    " * (dump + 2), 'Inner Class: %s' % inner_class)
 
@@ -1424,15 +1424,15 @@ def read_info(reader, dump=None):
                 if dump is not None:
                     reader.debug("    " * (dump + 3), 'Outer Class: (Anonymous)')
             else:
-                outer_class = reader.constant_pool[c2].name.string
+                outer_class = reader.constant_pool[c2].name.value
                 if dump is not None:
                     reader.debug("    " * (dump + 3), 'Outer Class: %s' % outer_class)
 
             c3 = reader.read_u2()
             if c3 == 0:
                 inner_name = None
             else:
-                inner_name = reader.constant_pool[c3].string
+                inner_name = reader.constant_pool[c3].value
                 if dump is not None:
                     reader.debug("    " * (dump + 3), 'Inner Name: %s' % inner_name)
 
@@ -1460,9 +1460,9 @@ def read_info(reader, dump=None):
 
             classes.append(
                 InnerClass(
-                    inner_class,
-                    outer_class,
                     inner_name,
+                    outer_class,
+                    inner_class,
                     public=bool(flags & InnerClass.ACC_PUBLIC),
                     private=bool(flags & InnerClass.ACC_PRIVATE),
                     protected=bool(flags & InnerClass.ACC_PROTECTED),