py26 and py33 support

abhishek1591 · Feb 16, 2017 · eb79b60 · eb79b60
1 parent 448c414
commit eb79b60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,9 @@
 language: python
 python:
   # We don't actually use the Travis Python, but this keeps it organized.
+  - "2.6"
   - "2.7"
+  - "3.3"
   - "3.4"
   - "3.5"
 

diff --git a/pandapower/build_branch.py b/pandapower/build_branch.py
@@ -355,7 +355,7 @@ def _trafo_df_from_trafo3w(net):
         sn = np.array([ttab.sn_hv_kva, ttab.sn_mv_kva, ttab.sn_lv_kva])
         uk_2w = z_br_to_bus(uk, sn)
         ur_2w = z_br_to_bus(ur, sn)
-        taps = [{tv: np.nan for tv in tap_variables} for _ in range(3)]
+        taps = [dict((tv, np.nan) for tv in tap_variables) for _ in range(3)]
         for k in range(3):
             taps[k]["tp_side"] = None
 
@@ -399,7 +399,11 @@ def _trafo_df_from_trafo3w(net):
     trafo_df = pd.DataFrame(trafos2w).T
     for var in list(tap_variables) + ["i0_percent", "sn_kva", "vsc_percent", "vscr_percent",
                                       "vn_hv_kv", "vn_lv_kv", "pfe_kw"]:
-        trafo_df[var] = pd.to_numeric(trafo_df[var])
+        try:
+            trafo_df[var] = pd.to_numeric(trafo_df[var])
+        except:
+            #legacy support for pandas versions < 0.17
+            trafo_df[var] = trafo_df[var].convert_objects(convert_numeric=True) 
     return trafo_df