Delete unneccessary SubSR.

reddit-archive · Jul 22, 2015 · d261e17 · d261e17
1 parent 9853214
commit d261e17
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 51 deletions.
diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py
@@ -233,8 +233,6 @@ def __call__(self, environ, start_response):
         if sr:
             environ['subreddit'] = sr.groups()[0]
             environ['PATH_INFO'] = self.sr_pattern.sub('', path) or '/'
-        elif path.startswith(('/subreddits', '/reddits')):
-            environ['subreddit'] = 'r'
         return self.app(environ, start_response)
 
 class DomainListingMiddleware(object):

diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py
@@ -110,7 +110,6 @@
     Random,
     RandomNSFW,
     RandomSubscription,
-    Sub,
     Subreddit,
     valid_admin_cookie,
     valid_feed,
@@ -369,9 +368,6 @@ def set_subreddit():
                 domain = ".".join((g.domain_prefix, domain))
             path = 'http://%s%s' % (domain, sr.path)
             abort(301, location=BaseController.format_output_url(path))
-    elif sr_name == 'r':
-        #reddits
-        c.site = Sub
     elif '+' in sr_name:
         name_filter = lambda name: Subreddit.is_valid_name(name,
             allow_language_srs=True)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
@@ -59,8 +59,6 @@
     RandomNSFW,
     RandomSubscription,
     StylesheetsEverywhere,
-    Sub,
-    SubSR,
     Subreddit,
     Target,
     Trophy,
@@ -1279,7 +1277,7 @@ def __init__(self, pagename, css_class=None, **context):
         Reddit.__init__(self, **context)
 
     def build_toolbars(self):
-        if not isinstance(c.site, (DefaultSR, SubSR)) and not c.cname:
+        if not isinstance(c.site, DefaultSR) and not c.cname:
             return [PageNameNav('subreddit', title = self.pagename)]
         else:
             return [PageNameNav('nomenu', title = self.pagename)]

diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py
@@ -654,15 +654,13 @@ def get_subreddit(self):
         On failure to find a subreddit, returns None.
         """
         from pylons import g
-        from r2.models import Subreddit, Sub, NotFound, DefaultSR
+        from r2.models import Subreddit, NotFound, DefaultSR
         try:
             if (not self.hostname or
                     is_subdomain(self.hostname, g.domain) or
                     self.hostname.startswith(g.domain)):
                 if self.path.startswith('/r/'):
                     return Subreddit._by_name(self.path.split('/')[2])
-                elif self.path.startswith(('/subreddits/', '/reddits/')):
-                    return Sub
                 else:
                     return DefaultSR()
             elif self.hostname:

diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py
@@ -2368,24 +2368,6 @@ class ContribSR(ModContribSR):
     query_param = "contributor"
     path = "/r/contrib"
 
-class SubSR(FakeSubreddit):
-    stylesheet = 'subreddit.css'
-    #this will make the javascript not send an SR parameter
-    name = ''
-    title = ''
-
-    def can_view(self, user):
-        return True
-
-    def can_comment(self, user):
-        return False
-
-    def can_submit(self, user, promotion=False):
-        return True
-
-    @property
-    def path(self):
-        return "/subreddits/"
 
 class DomainSR(FakeSubreddit):
     @property
@@ -2434,7 +2416,6 @@ def add_props(cls, user, wrapped):
         Printable.add_props(user, wrapped)
 
 Frontpage = DefaultSR()
-Sub = SubSR()
 Friends = FriendsSR()
 Mod = ModSR()
 Contrib = ContribSR()

diff --git a/r2/r2/templates/listing.compact b/r2/r2/templates/listing.compact
@@ -20,9 +20,6 @@
 ## reddit Inc. All Rights Reserved.
 ###############################################################################
 
-<%!
-   from r2.models import Sub
- %>
 <%namespace file="utils.html" import="plain_link" />
 
 <%

diff --git a/r2/r2/templates/listing.html b/r2/r2/templates/listing.html
@@ -22,7 +22,6 @@
 
 <%!
    from r2.lib.template_helpers import format_html
-   from r2.models import Sub
  %>
 <%namespace file="utils.html" import="plain_link" />
 
@@ -43,13 +42,13 @@
     <div class="nav-buttons">
       <span class="nextprev">${_("view more:")}&#32;
       %if thing.prev:
-        ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, _sr_path = (c.site != Sub), rel="nofollow prev")}
+        ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, rel="nofollow prev")}
       %endif
       %if thing.prev and thing.next:
         <span class="separator"></span>
       %endif
       %if thing.next:
-        ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next,  _sr_path = (c.site != Sub), rel="nofollow next")}
+        ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next, rel="nofollow next")}
       %endif
       </span>
       %if thing.next_suggestions:

diff --git a/r2/r2/templates/reddit.html b/r2/r2/templates/reddit.html
@@ -28,7 +28,7 @@
    from r2.lib import tracking
    from pylons import request
    from r2.lib.strings import strings
-   from r2.models import make_feedurl, Sub
+   from r2.models import make_feedurl
 %>
 <%namespace file="framebuster.html" import="framebuster"/>
 <%namespace file="less.html" import="less_js, less_stylesheet"/>

diff --git a/r2/r2/templates/redditheader.html b/r2/r2/templates/redditheader.html
@@ -29,7 +29,7 @@
        format_number,
        header_url,
    )
-   from r2.models import Sub, FakeSubreddit
+   from r2.models import FakeSubreddit
    from r2.models.subreddit import DefaultSR
    from r2.lib.pages import SearchForm
 %>

diff --git a/r2/r2/templates/redditheader.mobile b/r2/r2/templates/redditheader.mobile
@@ -22,7 +22,7 @@
 
 <%!
    from r2.lib.template_helpers import static
-   from r2.models import Sub, FakeSubreddit
+   from r2.models import FakeSubreddit
 %>
 <%namespace file="utils.html" import="plain_link, img_link, separator"/>
 

diff --git a/r2/r2/templates/searchlisting.html b/r2/r2/templates/searchlisting.html
@@ -22,7 +22,6 @@
 
 <%!
    from r2.lib.template_helpers import format_html
-   from r2.models import Sub
  %>
 
 <%namespace file="utils.html" import="plain_link" />
@@ -51,13 +50,13 @@
         <div class="nav-buttons">
           <span class="nextprev">${_("view more:")}&#32;
           %if thing.prev:
-            ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, _sr_path = (c.site != Sub), rel="nofollow prev")}
+            ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, rel="nofollow prev")}
           %endif
           %if thing.prev and thing.next:
             <span class="separator"></span>
           %endif
           %if thing.next:
-            ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next,  _sr_path = (c.site != Sub), rel="nofollow next")}
+            ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next, rel="nofollow next")}
           %endif
           </span>
           %if thing.next_suggestions:

diff --git a/r2/r2/templates/tablelisting.html b/r2/r2/templates/tablelisting.html
@@ -22,7 +22,6 @@
 
 <%!
    from r2.lib.template_helpers import format_html
-   from r2.models import Sub
  %>
 <%namespace file="utils.html" import="plain_link" />
 
@@ -49,15 +48,15 @@
 %if thing.nextprev and (thing.prev or thing.next):
   <p class="nextprev"> ${_("view more:")}&#32;
   %if thing.prev:
-    ${plain_link(_("first"), thing.first, _sr_path = (c.site != Sub), rel="nofollow first")}
+    ${plain_link(_("first"), thing.first, rel="nofollow first")}
     <span class="separator"></span>
-    ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, _sr_path = (c.site != Sub), rel="nofollow prev")}
+    ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, rel="nofollow prev")}
   %endif
   %if thing.prev and thing.next:
     <span class="separator"></span>
   %endif
   %if thing.next:
-  ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next,  _sr_path = (c.site != Sub), rel="nofollow next")}
+  ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next, rel="nofollow next")}
   %endif
   </p>
 %endif

diff --git a/r2/r2/templates/userlisting.html b/r2/r2/templates/userlisting.html
@@ -22,7 +22,6 @@
 
 <%!
    from r2.lib.template_helpers import format_html
-   from r2.models import Sub
  %>
 <%namespace file="utils.html" import="error_field, plain_link" />
 
@@ -104,15 +103,15 @@ <h1>
 %if thing.nextprev and (thing.prev or thing.next):
   <p class="nextprev"> ${_("view more:")}&#32;
   %if thing.prev:
-    ${plain_link(_("first"), thing.first, _sr_path = (c.site != Sub), rel="nofollow first")} 
+    ${plain_link(_("first"), thing.first, rel="nofollow first")} 
     <span class="separator"></span>
-    ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, _sr_path = (c.site != Sub), rel="nofollow prev")}
+    ${plain_link(format_html("&lsaquo; %s", _("prev")), thing.prev, rel="nofollow prev")}
   %endif
   %if thing.prev and thing.next:
     <span class="separator"></span>
   %endif
   %if thing.next:
-  ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next,  _sr_path = (c.site != Sub), rel="nofollow next")}
+  ${plain_link(format_html("%s &rsaquo;", _("next")), thing.next, rel="nofollow next")}
   %endif
   </p>
 %endif