table_from_frames: fix for non-orange dataframes

Orange/data/pandas_compat.py

@@ -398,13 +398,12 @@ def table_from_frames(xdf, ydf, mdf):
     W = None
     for df in dfs:
         if isinstance(df, OrangeDataFrame):
-            W = [df.orange_weights[i] for i in df.index
-                 if i in df.orange_weights]
+            W = [df.orange_weights[i] for i in df.index if i in df.orange_weights]
             if len(W) != len(df.index):
                 W = None
+            attributes.update(df.orange_attributes)
         else:
             W = None
-        attributes.update(df.orange_attributes)
 
     return Table.from_numpy(
         domain,

Orange/data/tests/test_pandas.py

@@ -429,7 +429,7 @@ def _get_orange_demo_datasets():
             self.assertEqual(len(df.columns), len(table.domain.variables), assert_message)
 
     def test_table_from_frames(self):
-        table = Table("brown-selected")
+        table = Table("brown-selected")  # dataset with all X, Y and metas
         table.ids = np.arange(100, len(table) + 100, 1, dtype=int)
 
         x, y, m = table.to_pandas_dfs()
@@ -443,6 +443,20 @@ def test_table_from_frames(self):
         self.assertTupleEqual(table.domain.metas, new_table.domain.metas)
         self.assertEqual(table.domain.class_var, new_table.domain.class_var)
 
+    def test_table_from_frames_not_orangedataframe(self):
+        df = pd.DataFrame(np.random.rand(10, 2), columns=["A", "B"])
+        df_metas = pd.DataFrame(np.random.rand(10, 2), columns=["C", "D"])
+        df_y = pd.DataFrame(np.random.rand(10, 1), columns=["Y"])
+
+        new_table = Table.from_pandas_dfs(df, df_y, df_metas)
+
+        np.testing.assert_array_equal(df, new_table.X)
+        np.testing.assert_array_equal(df_y, new_table.Y)
+        np.testing.assert_array_equal(df_metas, new_table.metas)
+        self.assertListEqual(df.columns, [v.name for v in new_table.domain.attributes])
+        self.assertTupleEqual(table.domain.metas, new_table.domain.metas)
+        self.assertEqual(table.domain.class_var, new_table.domain.class_var)
+
 
 class TestTablePandas(unittest.TestCase):
     def setUp(self):