Permalink
Browse files

* r2/model is nearly complete. Still need to convert to using decerators

* r2/controllers no longer has any global imports
* r2/controllers is not in final state, but closer
* added missing r2admin prototype send_system_message to admintools
* fixed what looked like a typo in ipn.py : verify_ipn
* fixed what looked like a typo in promotecontroller.py : POST_edit_promo
  • Loading branch information...
kkress committed Sep 8, 2012
1 parent a2f8a5e commit 2e6f8ee4584804de7a484485b2a8c58192ff5e82
Showing with 1,926 additions and 785 deletions.
  1. +246 −0 r2/pylintrc
  2. +0 −8 r2/r2/config/utils.py
  3. +8 −3 r2/r2/controllers/ads.py
  4. +159 −39 r2/r2/controllers/api.py
  5. +3 −1 r2/r2/controllers/apiv1.py
  6. +13 −4 r2/r2/controllers/awards.py
  7. +24 −8 r2/r2/controllers/buttons.py
  8. +3 −2 r2/r2/controllers/captcha.py
  9. +9 −7 r2/r2/controllers/embed.py
  10. +5 −9 r2/r2/controllers/error.py
  11. +3 −3 r2/r2/controllers/errorlog.py
  12. +3 −2 r2/r2/controllers/errors.py
  13. +3 −4 r2/r2/controllers/feedback.py
  14. +153 −35 r2/r2/controllers/front.py
  15. +1 −8 r2/r2/controllers/health.py
  16. +31 −9 r2/r2/controllers/ipn.py
  17. +71 −26 r2/r2/controllers/listingcontroller.py
  18. +5 −4 r2/r2/controllers/mediaembed.py
  19. +20 −8 r2/r2/controllers/oauth2.py
  20. +20 −9 r2/r2/controllers/post.py
  21. +42 −13 r2/r2/controllers/promotecontroller.py
  22. +7 −5 r2/r2/controllers/querycontroller.py
  23. +59 −25 r2/r2/controllers/reddit_base.py
  24. +3 −2 r2/r2/controllers/redirect.py
  25. +25 −11 r2/r2/controllers/toolbar.py
  26. +3 −3 r2/r2/controllers/usage.py
  27. +40 −23 r2/r2/controllers/validator/validator.py
  28. +21 −12 r2/r2/lib/template_helpers.py
  29. +18 −14 r2/r2/models/__init__.py
  30. +21 −4 r2/r2/models/_builder.pyx
  31. +7 −30 r2/r2/models/account.py
  32. +62 −0 r2/r2/models/account_subreddit.py
  33. +3 −0 r2/r2/models/ad.py
  34. +33 −2 r2/r2/models/admintools.py
  35. +16 −3 r2/r2/models/award.py
  36. +35 −11 r2/r2/models/bidding.py
  37. +7 −342 r2/r2/models/builder.py
  38. +379 −0 r2/r2/models/builders.py
  39. +20 −4 r2/r2/models/flair.py
  40. +24 −9 r2/r2/models/gold.py
  41. +19 −6 r2/r2/models/jury.py
  42. +9 −0 r2/r2/models/keyvalue.py
  43. +8 −0 r2/r2/models/last_modified.py
  44. +44 −20 r2/r2/models/link.py
  45. +14 −9 r2/r2/models/listing.py
  46. +21 −6 r2/r2/models/mail_queue.py
  47. +23 −7 r2/r2/models/modaction.py
  48. +3 −4 r2/r2/models/populatedb.py
  49. +11 −0 r2/r2/models/printable.py
  50. +10 −3 r2/r2/models/promo.py
  51. +18 −2 r2/r2/models/query_cache.py
  52. +17 −5 r2/r2/models/report.py
  53. +41 −9 r2/r2/models/subreddit.py
  54. +16 −0 r2/r2/models/token.py
  55. +21 −1 r2/r2/models/traffic.py
  56. +19 −3 r2/r2/models/trial.py
  57. +13 −1 r2/r2/models/update_karmas.py
  58. +14 −7 r2/r2/models/vote.py
View
@@ -0,0 +1,246 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add <file or directory> to the black list. It should be a base name, not a
+# path. You may set this option multiple times.
+ignore=CVS
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once).
+# E1103: X has no Y member (but some types could not be inferred)
+# W0212: Access to a protected member of X class
+# W0223: Method Y is abstract in class X but not overridden
+# C0111: Missing docstring
+# W0142: Used * or ** magic
+# R0201: Method could be a function
+# R0915: Too many statements
+# I0011: Locally disabling ... (don't need to see things we've explicitly disabled)
+disable=E1103,W0212,W0223,C0111,W0142,R0201,R0915,I0011
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html
+output-format=text
+
+# Include message's id in output
+include-ids=yes
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,c,g,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=__.*__
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string=' '
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=unused|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=25
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=0
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
View
@@ -20,14 +20,6 @@
# Inc. All Rights Reserved.
###############################################################################
-iters = (list, tuple, set)
-
-def tup(item, ret_is_single=False):
- if isinstance(item, iters):
- return (item, False) if ret_is_single else item
- else:
- return ((item,), True) if ret_is_single else (item,)
-
class Storage(dict):
"""
A Storage object is like a dictionary except `obj.foo` can be used
View
@@ -20,10 +20,15 @@
# Inc. All Rights Reserved.
###############################################################################
-from pylons import request, g
-from reddit_base import RedditController
+from pylons.controllers.util import abort
+
from r2.lib.pages import AdminPage, AdminAds, AdminAdAssign, AdminAdSRs
-from validator import *
+
+from r2.controllers.reddit_base import RedditController
+from r2.controllers.validator import (VAdByCodename,
+ VSponsorAdmin,
+ validate,
+ )
class AdsController(RedditController):
Oops, something went wrong.

0 comments on commit 2e6f8ee

Please sign in to comment.