Remove PageSet.FromFile method since it's no longer used.

BUG=

Review URL: https://codereview.chromium.org/555843003

Cr-Commit-Position: refs/heads/master@{#294069}

tools/telemetry/telemetry/page/page_set.py

@@ -6,7 +6,6 @@ import csv
 import inspect
 import os
 
-from telemetry.core import util
 from telemetry.page import page as page_module
 from telemetry.page import page_set_archive_info
 from telemetry.util import cloud_storage
@@ -77,38 +76,6 @@ class PageSet(object):
     self.AddPage(page_module.Page(
       page_url, self, self.base_dir))
 
-  @staticmethod
-  def FromFile(file_path):
-    _, ext_name = os.path.splitext(file_path)
-    if ext_name == '.py':
-      return PageSet.FromPythonFile(file_path)
-    else:
-      raise PageSetError("Pageset %s has unsupported file type" % file_path)
-
-  @staticmethod
-  def FromPythonFile(file_path):
-    page_set_classes = []
-    module = util.GetPythonPageSetModule(file_path)
-    for m in dir(module):
-      if m.endswith('PageSet') and m != 'PageSet':
-        page_set_classes.append(getattr(module, m))
-    if len(page_set_classes) != 1:
-      raise PageSetError("Pageset file needs to contain exactly 1 pageset class"
-                         " with suffix 'PageSet'")
-    page_set = page_set_classes[0]()
-    for page in page_set.pages:
-      page_class = page.__class__
-
-      for method_name, method in inspect.getmembers(page_class,
-                                                    predicate=inspect.ismethod):
-        if method_name.startswith("Run"):
-          args, _, _, _ = inspect.getargspec(method)
-          if not (args[0] == "self" and args[1] == "action_runner"):
-            raise PageSetError("""Definition of Run<...> method of all
-pages in %s must be in the form of def Run<...>(self, action_runner):"""
-                                     % file_path)
-    return page_set
-
   @staticmethod
   def _IsValidPrivacyBucket(bucket_name):
     if not bucket_name:

tools/telemetry/telemetry/page/page_set_unittest.py

@@ -6,7 +6,6 @@ import os
 import tempfile
 import unittest
 
-from telemetry.core import util
 from telemetry.page import page
 from telemetry.page import page_set
 from telemetry.util import cloud_storage
@@ -43,45 +42,6 @@ class TestPageSet(unittest.TestCase):
     finally:
       os.rmdir(directory_path)
 
-  def testSuccesfulPythonPageSetLoading(self):
-    test_pps_dir = os.path.join(util.GetUnittestDataDir(), 'test_page_set.py')
-    pps = page_set.PageSet.FromFile(test_pps_dir)
-    self.assertEqual('TestPageSet', pps.__class__.__name__)
-    self.assertEqual('A pageset for testing purpose', pps.Description())
-    self.assertEqual('data/test.json', pps.archive_data_file)
-    self.assertEqual('data/credential', pps.credentials_path)
-    self.assertEqual('desktop', pps.user_agent_type)
-    self.assertEqual(test_pps_dir, pps.file_path)
-    self.assertEqual(page_set.PUBLIC_BUCKET, pps.bucket)
-    self.assertEqual(3, len(pps.pages))
-    google_page = pps.pages[0]
-    self.assertEqual('https://www.google.com', google_page.url)
-    self.assertIs(pps, google_page.page_set)
-    self.assertTrue(5, google_page.RunGetActionRunner(action_runner=5))
-
-  def testMultiplePythonPageSetsLoading(self):
-    test_pps_1_dir = os.path.join(util.GetUnittestDataDir(),
-                                'test_simple_one_page_set.py')
-    test_pps_2_dir = os.path.join(util.GetUnittestDataDir(),
-                                'test_simple_two_page_set.py')
-    pps1 = page_set.PageSet.FromFile(test_pps_1_dir)
-    pps2 = page_set.PageSet.FromFile(test_pps_2_dir)
-
-    self.assertEqual('TestSimpleOnePageSet', pps1.__class__.__name__)
-    self.assertEqual('TestSimpleTwoPageSet', pps2.__class__.__name__)
-
-  def testPageFilePath(self):
-    test_pps_dir = os.path.join(util.GetUnittestDataDir(), 'test_page_set.py')
-    pps = page_set.PageSet.FromFile(test_pps_dir)
-    internal_page = pps.pages[1]
-    external_page = pps.pages[2]
-    self.assertEqual(
-      os.path.normpath(os.path.join(
-        util.GetUnittestDataDir(), 'bar.html')), internal_page.file_path)
-    self.assertEqual(
-      os.path.normpath(os.path.join(
-        util.GetUnittestDataDir(), 'pages/foo.html')), external_page.file_path)
-
   def testCloudBucket(self):
     blank_ps = page_set.PageSet()
     expected_bucket = None