Changeset 181145 in webkit

Timestamp:

Mar 6, 2015 1:23:17 AM (9 years ago)

Author:

Csaba Osztrogonác

Message:

setup-git-clone fails due to the failure to download python-irclib-0.4.8
​https://bugs.webkit.org/show_bug.cgi?id=141946

Reviewed by Ryosuke Niwa.

Check in ircbot.py and irclib.py to avoid network problems in the future.

• Scripts/webkitpy/common/net/irc/ircbot.py:
• Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook.find_module):
(AutoinstallImportHook._install_irc): Deleted.

• Scripts/webkitpy/thirdparty/init_unittest.py:

(ThirdpartyTest.test_imports):

• Scripts/webkitpy/thirdparty/irc/init.py: Added.
• Scripts/webkitpy/thirdparty/irc/ircbot.py: Added.
• Scripts/webkitpy/thirdparty/irc/irclib.py: Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/irc/ircbot.py (modified) (1 diff)
• Scripts/webkitpy/thirdparty/__init__.py (modified) (2 diffs)
• Scripts/webkitpy/thirdparty/__init___unittest.py (modified) (1 diff)
• Scripts/webkitpy/thirdparty/irc (added)
• Scripts/webkitpy/thirdparty/irc/__init__.py (added)
• Scripts/webkitpy/thirdparty/irc/ircbot.py (added)
• Scripts/webkitpy/thirdparty/irc/irclib.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-06  Csaba Osztrogonác  <ossy@webkit.org>
+
+        setup-git-clone fails due to the failure to download python-irclib-0.4.8
+        https://bugs.webkit.org/show_bug.cgi?id=141946
+
+        Reviewed by Ryosuke Niwa.
+
+        Check in ircbot.py and irclib.py to avoid network problems in the future.
+
+        * Scripts/webkitpy/common/net/irc/ircbot.py:
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook.find_module):
+        (AutoinstallImportHook._install_irc): Deleted.
+        * Scripts/webkitpy/thirdparty/__init___unittest.py:
+        (ThirdpartyTest.test_imports):
+        * Scripts/webkitpy/thirdparty/irc/__init__.py: Added.
+        * Scripts/webkitpy/thirdparty/irc/ircbot.py: Added.
+        * Scripts/webkitpy/thirdparty/irc/irclib.py: Added.
+
 2015-03-06  David Kilzer  <ddkilzer@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/net/irc/ircbot.py

@@ -30 +30 @@
 
 from webkitpy.common.thread.messagepump import MessagePump, MessagePumpDelegate
-from webkitpy.thirdparty.autoinstalled.irc import ircbot
-from webkitpy.thirdparty.autoinstalled.irc import irclib
+from webkitpy.thirdparty.irc import ircbot
+from webkitpy.thirdparty.irc import irclib
 
 

trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

@@ -88 +88 @@
         elif '.eliza' in fullname:
             self._install_eliza()
-        elif '.irc' in fullname:
-            self._install_irc()
         elif '.buildbot' in fullname:
             self._install_buildbot()
@@ -151 +149 @@
         self._install(url="http://www.adambarth.com/webkit/eliza", target_name="eliza.py")
 
-    def _install_irc(self):
-        # Since irclib and ircbot are two top-level packages, we need to import
-        # them separately.  We group them into an irc package for better
-        # organization purposes.
-        irc_dir = self._fs.join(_AUTOINSTALLED_DIR, "irc")
-        installer = AutoInstaller(target_dir=irc_dir)
-        installer.install(url="http://downloads.sourceforge.net/project/python-irclib/python-irclib/0.4.8/python-irclib-0.4.8.tar.gz",
-                                                url_subpath="python-irclib-0.4.8/irclib.py")
-        installer.install(url="http://downloads.sourceforge.net/project/python-irclib/python-irclib/0.4.8/python-irclib-0.4.8.tar.gz",
-                          url_subpath="python-irclib-0.4.8/ircbot.py")
-
     def _install(self, url, url_subpath=None, target_name=None):
         installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)

trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py

@@ -62 +62 @@
         import webkitpy.thirdparty.autoinstalled.coverage
         import webkitpy.thirdparty.autoinstalled.eliza
-        import webkitpy.thirdparty.autoinstalled.irc.ircbot
-        import webkitpy.thirdparty.autoinstalled.irc.irclib
         import webkitpy.thirdparty.autoinstalled.mechanize
         import webkitpy.thirdparty.autoinstalled.pylint