summaryrefslogtreecommitdiffstats
path: root/virtualenv/pffedportal
diff options
context:
space:
mode:
authorThomas NOEL <tnoel@entrouvert.com>2013-03-21 11:42:12 (GMT)
committerThomas NOEL <tnoel@entrouvert.com>2013-03-21 11:42:12 (GMT)
commit8fba9604528ace87e26ec080dc18f6319200e911 (patch)
treef3af1c260ff37a4715385cdbc9160fa8efa88e26 /virtualenv/pffedportal
parentaa2d7ae9fcf2df4a8bca02e4e7595d26e63c2ba6 (diff)
downloadunivnautes-old-8fba9604528ace87e26ec080dc18f6319200e911.zip
univnautes-old-8fba9604528ace87e26ec080dc18f6319200e911.tar.gz
univnautes-old-8fba9604528ace87e26ec080dc18f6319200e911.tar.bz2
pffedportal: delete mobile detection
Diffstat (limited to 'virtualenv/pffedportal')
-rw-r--r--virtualenv/pffedportal/mobile/__init__.py0
-rw-r--r--virtualenv/pffedportal/mobile/middleware.py34
-rw-r--r--virtualenv/pffedportal/mobile/template.py66
-rw-r--r--virtualenv/pffedportal/settings.py23
4 files changed, 0 insertions, 123 deletions
diff --git a/virtualenv/pffedportal/mobile/__init__.py b/virtualenv/pffedportal/mobile/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/virtualenv/pffedportal/mobile/__init__.py
+++ /dev/null
diff --git a/virtualenv/pffedportal/mobile/middleware.py b/virtualenv/pffedportal/mobile/middleware.py
deleted file mode 100644
index 28b874e..0000000
--- a/virtualenv/pffedportal/mobile/middleware.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-inspired by http://sullerton.com/2011/03/django-mobile-browser-detection-middleware/
-"""
-
-try:
- from threading import local
-except ImportError:
- from django.utils._threading_local import local
-
-_thread_locals = local()
-
-# from http://detectmobilebrowser.com/
-# Ported ty Python by Matt Sullivan
-# http://sullerton.com/2011/03/django-mobile-browser-detection-middleware/
-import re
-
-reg_b = re.compile(r"android.+mobile|avantgo|bada\\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|meego.+mobile|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino", re.I|re.M)
-reg_v = re.compile(r"1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\\-|your|zeto|zte\\-", re.I|re.M)
-
-def get_current_request():
- return getattr(_thread_locals, 'request', None)
-
-class RequestMiddleware():
- def process_request(self, request):
- request.is_mobile = False
- if request.META.has_key('HTTP_USER_AGENT'):
- user_agent = request.META['HTTP_USER_AGENT']
- b = reg_b.search(user_agent)
- v = reg_v.search(user_agent[0:4])
- if b or v:
- #this is a mobile request
- request.is_mobile = True
- _thread_locals.request = request
-
diff --git a/virtualenv/pffedportal/mobile/template.py b/virtualenv/pffedportal/mobile/template.py
deleted file mode 100644
index 342eddd..0000000
--- a/virtualenv/pffedportal/mobile/template.py
+++ /dev/null
@@ -1,66 +0,0 @@
-"""
-inspired by http://sullerton.com/2011/03/django-mobile-browser-detection-middleware/
-"""
-
-from django.conf import settings
-from django.template import TemplateDoesNotExist
-from django.template.loader import BaseLoader
-from django.utils._os import safe_join
-from mobile.middleware import get_current_request
-
-class Loader(BaseLoader):
- is_usable = True
-
- def get_template_sources(self, template_name, template_dirs=None):
- """
- Returns the absolute paths to "template_name", when appended to each
- directory in "template_dirs". Any paths that don't lie inside one of the
- template dirs are excluded from the result set, for security reasons.
- """
- if not template_dirs:
- template_dirs = settings.TEMPLATE_DIRS
- request = get_current_request()
- for template_dir in template_dirs:
- try:
- if settings.MOBILE_FORCE or \
- (hasattr(request, 'is_mobile') and request.is_mobile):
- yield safe_join(template_dir, 'mobile', template_name)
- yield safe_join(template_dir, template_name)
- except UnicodeDecodeError:
- # The template dir name was a bytestring that wasn't valid UTF-8.
- raise
- except ValueError:
- # The joined path was located outside of this particular
- # template_dir (it might be inside another one, so this isn't
- # fatal).
- pass
-
- def load_template_source(self, template_name, template_dirs=None):
- tried = []
- for filepath in self.get_template_sources(template_name, template_dirs):
- try:
- file = open(filepath)
- try:
- return (file.read().decode(settings.FILE_CHARSET), filepath)
- finally:
- file.close()
- except IOError:
- tried.append(filepath)
- if tried:
- error_msg = "Tried %s" % tried
- else:
- error_msg = "Your TEMPLATE_DIRS setting is empty. Change it to point to at least one template directory."
- raise TemplateDoesNotExist(error_msg)
-
-_loader = Loader()
-
-def load_template_source(template_name, template_dirs=None):
- # For backwards compatibility
- import warnings
- warnings.warn(
- "'django.template.loaders.filesystem.load_template_source' is deprecated; use 'django.template.loaders.filesystem.Loader' instead.",
- PendingDeprecationWarning
- )
- return _loader.load_template_source(template_name, template_dirs)
-
-load_template_source.is_usable = True
diff --git a/virtualenv/pffedportal/settings.py b/virtualenv/pffedportal/settings.py
index b6f0712..df46ade 100644
--- a/virtualenv/pffedportal/settings.py
+++ b/virtualenv/pffedportal/settings.py
@@ -248,26 +248,7 @@ try:
except:
REDIRECT_URL = None
-# mobile/smartphone detection flag
-try:
- if root.find('installedpackages/univnautestexts/config/mobile_detection').text == None:
- MOBILE_DETECTION = False
- else:
- MOBILE_DETECTION = True
-except:
- MOBILE_DETECTION = True
-
-try:
- if root.find('installedpackages/univnautestexts/config/mobile_force').text == None:
- MOBILE_FORCE = False
- else:
- MOBILE_FORCE = True
-except:
- MOBILE_FORCE = False
-
-
# /mail form
-
try:
EMAIL_RCPT = root.find('installedpackages/univnautestexts/config/email_rcpt').text
except:
@@ -320,10 +301,6 @@ try:
except ImportError:
pass
-if MOBILE_DETECTION:
- TEMPLATE_LOADERS = ( 'mobile.template.Loader', ) + TEMPLATE_LOADERS
- MIDDLEWARE_CLASSES += ( 'mobile.middleware.RequestMiddleware', )
-
# nasty logs...
if LOG_DEBUG:
DISPLAY_MESSAGE_ERROR_PAGE = True