From 6e125fb05f0bc3cb199c7b0b5a1347a2404946ed Mon Sep 17 00:00:00 2001
From: Techwolf <dring@wolfishly.me>
Date: Fri, 5 Jul 2019 22:35:28 -0700
Subject: [PATCH] Merge TracyAndTristan into ComicFury list

---
 dosagelib/plugins/comicfury.py | 1 +
 dosagelib/plugins/old.py       | 1 +
 dosagelib/plugins/t.py         | 9 ---------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dosagelib/plugins/comicfury.py b/dosagelib/plugins/comicfury.py
index 93a6ccdad..56127ca22 100644
--- a/dosagelib/plugins/comicfury.py
+++ b/dosagelib/plugins/comicfury.py
@@ -1112,6 +1112,7 @@ class ComicFury(_ParserScraper):
             cls('TotallyKaimeraBackgroundStory2', 'totallykaimerabackgroundstory2'),
             cls('TotallyKaimeraPart2', 'totallykaimerapart2'),
             cls('TotallyKaimeraPart3', 'totallykaimerapart3'),
+            cls('TracyAndTristan', 'tandt'),
             cls('TradScribbles', 'tradscribbles'),
             cls('TrAgEdY', 'tragedy'),
             cls('TransdimensionalBrainChip', 'brainchip'),
diff --git a/dosagelib/plugins/old.py b/dosagelib/plugins/old.py
index a8e16609f..c161e377d 100644
--- a/dosagelib/plugins/old.py
+++ b/dosagelib/plugins/old.py
@@ -625,6 +625,7 @@ class Renamed(Scraper):
             cls('KeenSpot/TheGodChild', 'GodChild'),
             cls('PetiteSymphony/Djandora', 'ComicsBreak/Djandora'),
             cls('PetiteSymphony/Generation17', 'ComicsBreak/Generation17'),
+            cls('TracyAndTristan', 'ComicFury/TracyAndTristan'),
             cls('Wulffmorgenthaler', 'WuMo'),
             cls('ZebraGirl', 'ComicFury/ZebraGirl'),
         )
diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py
index 695415dd0..b06c740a4 100644
--- a/dosagelib/plugins/t.py
+++ b/dosagelib/plugins/t.py
@@ -218,15 +218,6 @@ class TracesOfThePastNSFW(_WPNaviIn):
     adult = True
 
 
-class TracyAndTristan(_BasicScraper):
-    url = 'http://tandt.thecomicseries.com/'
-    rurl = escape(url)
-    stripUrl = url + 'comics/%s'
-    imageSearch = compile(tagre("img", "src", r'(%simages/comics/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(/comics/\d+)', after="prev"))
-    help = 'Index format: number'
-
-
 class TrippingOverYou(_BasicScraper):
     url = 'http://www.trippingoveryou.com/'
     stripUrl = url + 'comic/%s'