File size: 33,485 Bytes
5980447 |
1 2 |
{"repo": "fedora-infra/python-fedora", "pull_number": 117, "instance_id": "fedora-infra__python-fedora-117", "issue_numbers": "", "base_commit": "d817aa4cceb80b28018b90b5d3fc69ddba07179c", "patch": "diff --git a/fedora/accounts/__init__.py b/fedora/accounts/__init__.py\ndeleted file mode 100644\n--- a/fedora/accounts/__init__.py\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-'''\n-Classes for interacting with the account system.\n-'''\ndiff --git a/fedora/accounts/fas2.py b/fedora/accounts/fas2.py\ndeleted file mode 100644\n--- a/fedora/accounts/fas2.py\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-'''This is for compatibility.\n-\n-The canonical location for this module from 0.3 on is fedora.client.fas2\n-'''\n-import warnings\n-\n-warnings.warn('fedora.accounts.fas2 has moved to fedora.client.fas2. This'\n- ' location will disappear in 0.4', DeprecationWarning,\n- stacklevel=2)\n-\n-# pylint: disable-msg=W0401,W0614\n-from fedora.client.fas2 import *\ndiff --git a/fedora/client/__init__.py b/fedora/client/__init__.py\n--- a/fedora/client/__init__.py\n+++ b/fedora/client/__init__.py\n@@ -30,7 +30,7 @@\n '''\n import warnings\n \n-from bunch import Bunch\n+from munch import Munch\n \n \n class FedoraClientError(Exception):\n@@ -108,12 +108,12 @@ def __str__(self):\n \n \n # Backwards compatibility\n-class DictContainer(Bunch):\n+class DictContainer(Munch):\n def __init__(self, *args, **kwargs):\n warnings.warn(\n- 'DictContainer is deprecated. Use the Bunch class'\n+ 'DictContainer is deprecated. Use the Munch class'\n ' from python-bunch instead.', DeprecationWarning, stacklevel=2)\n- Bunch.__init__(self, *args, **kwargs)\n+ Munch.__init__(self, *args, **kwargs)\n \n \n # We want people to be able to import fedora.client.*Client directly\ndiff --git a/fedora/client/baseclient.py b/fedora/client/baseclient.py\n--- a/fedora/client/baseclient.py\n+++ b/fedora/client/baseclient.py\n@@ -20,16 +20,18 @@\n \n .. moduleauthor:: Luke Macken <lmacken@redhat.com>\n .. moduleauthor:: Toshio Kuratomi <tkuratom@redhat.com>\n+.. moduleauthor:: Ralph Bean <rbean@redhat.com>\n '''\n \n import os\n import stat\n from os import path\n import logging\n-import cPickle as pickle\n-import Cookie\n import warnings\n \n+import six.moves.cPickle as pickle\n+import six.moves.http_cookies as Cookie\n+\n from kitchen.text.converters import to_bytes\n \n from fedora import __version__\n@@ -115,13 +117,11 @@ def __load_ids(self):\n session_file = None\n if path.isfile(b_SESSION_FILE):\n try:\n- session_file = file(b_SESSION_FILE, 'r')\n- saved_session = pickle.load(session_file)\n+ with open(b_SESSION_FILE, 'rb') as session_file:\n+ saved_session = pickle.load(session_file)\n except (IOError, EOFError):\n self.log.info('Unable to load session from %(file)s' %\n {'file': b_SESSION_FILE})\n- if session_file:\n- session_file.close()\n \n return saved_session\n \n@@ -133,16 +133,15 @@ def __save_ids(self, save):\n # Make sure the directory exists\n if not path.isdir(b_SESSION_DIR):\n try:\n- os.mkdir(b_SESSION_DIR, 0755)\n- except OSError, e:\n+ os.mkdir(b_SESSION_DIR, 0o755)\n+ except OSError as e:\n self.log.warning('Unable to create %(dir)s: %(error)s' %\n {'dir': b_SESSION_DIR, 'error': to_bytes(e)})\n \n try:\n- session_file = file(b_SESSION_FILE, 'w')\n- os.chmod(b_SESSION_FILE, stat.S_IRUSR | stat.S_IWUSR)\n- pickle.dump(save, session_file)\n- session_file.close()\n+ with open(b_SESSION_FILE, 'wb') as session_file:\n+ os.chmod(b_SESSION_FILE, stat.S_IRUSR | stat.S_IWUSR)\n+ pickle.dump(save, session_file)\n except Exception as e: # pylint: disable-msg=W0703\n # If we can't save the file, issue a warning but go on. The\n # session just keeps you from having to type your password over\ndiff --git a/fedora/client/bodhi.py b/fedora/client/bodhi.py\n--- a/fedora/client/bodhi.py\n+++ b/fedora/client/bodhi.py\n@@ -142,7 +142,7 @@ def query(self, release=None, status=None, type_=None, bugs=None,\n auth = False\n if params['mine']:\n auth = True\n- for key, value in params.items():\n+ for key, value in list(params.items()):\n if not value:\n del params[key]\n return self.send_request('list', req_params=params, auth=auth)\n@@ -211,7 +211,8 @@ def testable(self):\n from yum import YumBase\n yum = YumBase()\n yum.doConfigSetup(init_plugins=False)\n- fedora = file('/etc/fedora-release').readlines()[0].split()[2]\n+ with open('/etc/fedora-release', 'r') as f:\n+ fedora = f.readlines()[0].split()[2]\n tag = 'f%s-updates-testing' % fedora\n builds = self.get_koji_session(\n login=False).listTagged(tag, latest=True)\ndiff --git a/fedora/client/fas2.py b/fedora/client/fas2.py\n--- a/fedora/client/fas2.py\n+++ b/fedora/client/fas2.py\n@@ -28,9 +28,11 @@\n import urllib\n import warnings\n \n-from bunch import Bunch\n+from munch import Munch\n from kitchen.text.converters import to_bytes\n \n+from six.moves.urllib_parse import urlencode, quote\n+\n try:\n import libravatar\n except ImportError:\n@@ -320,8 +322,8 @@ def create_group(self, name, display_name, owner, group_type,\n :kwarg joinmsg: A message shown to users when they apply to the group.\n :kwarg apply_rules: Rules for applying to the group, shown to users\n before they apply.\n- :rtype: :obj:`bunch.Bunch`\n- :returns: A Bunch containing information about the group that was\n+ :rtype: :obj:`munch.Munch`\n+ :returns: A Munch containing information about the group that was\n created.\n \n .. versionadded:: 0.3.29\n@@ -337,10 +339,10 @@ def create_group(self, name, display_name, owner, group_type,\n \n request = self.send_request(\n '/group/create/%s/%s/%s/%s' % (\n- urllib.quote(name),\n- urllib.quote(display_name),\n- urllib.quote(owner),\n- urllib.quote(group_type)),\n+ quote(name),\n+ quote(display_name),\n+ quote(owner),\n+ quote(group_type)),\n req_params=req_params,\n auth=True\n )\n@@ -394,7 +396,7 @@ def group_members(self, groupname):\n request = self.send_request('/group/dump/%s' %\n urllib.quote(groupname), auth=True)\n \n- return [Bunch(username=user[0],\n+ return [Munch(username=user[0],\n role_type=user[3]) for user in request['people']]\n \n ### People ###\n@@ -545,7 +547,7 @@ def avatar_url(self, username, size=64,\n else:\n email = \"%s@fedoraproject.org\" % username\n \n- query_string = urllib.urlencode({\n+ query_string = urlencode({\n 's': size,\n 'd': default,\n })\n@@ -693,7 +695,7 @@ def people_by_key(self, key=u'username', search=u'*', fields=None):\n },\n auth=True)\n \n- people = Bunch()\n+ people = Munch()\n for person in itertools.chain(request['people'],\n request['unapproved_people']):\n # Retrieve bugzilla_email from our list if necessary\n@@ -732,7 +734,7 @@ def people_by_id(self):\n \n request = self.send_request('/json/user_id', auth=True)\n user_to_id = {}\n- people = Bunch()\n+ people = Munch()\n for person_id, username in request['people'].items():\n person_id = int(person_id)\n # change userids from string back to integer\ndiff --git a/fedora/client/openidproxyclient.py b/fedora/client/openidproxyclient.py\n--- a/fedora/client/openidproxyclient.py\n+++ b/fedora/client/openidproxyclient.py\n@@ -27,7 +27,6 @@\n \"\"\"\n \n import copy\n-import httplib\n import logging\n import re\n # For handling an exception that's coming from requests:\n@@ -35,12 +34,8 @@\n import time\n import urllib\n \n-try:\n- # Python2\n- from urlparse import urljoin, urlparse, parse_qs\n-except ImportError:\n- # Python3 support\n- from urllib.parse import urljoin, urlparse, parse_qs\n+import six.moves.http_client as httplib\n+from six.moves.urllib_parse import urljoin, urlparse, parse_qs\n \n # Hack, hack, hack around\n # the horror that is logging!\n@@ -56,13 +51,13 @@ def emit(self, *args):\n \n import requests\n \n-#from bunch import bunchify\n+#from munch import munchify\n from kitchen.text.converters import to_bytes\n # For handling an exception that's coming from requests:\n import urllib3\n \n from fedora import __version__\n-from fedora.client import AuthError, ServerError, LoginRequiredError, FedoraServiceError\n+from fedora.client import AuthError, ServerError, FedoraServiceError\n \n log = logging.getLogger(__name__)\n log.addHandler(NullHandler())\n@@ -555,7 +550,7 @@ def send_request(self, method, verb='POST', req_params=None,\n new_session = session.cookies.get(self.session_name, '')\n \n log.debug('openidproxyclient.send_request: exited')\n- #data = bunchify(data)\n+ #data = munchify(data)\n return new_session, response\n \n \ndiff --git a/fedora/client/proxyclient.py b/fedora/client/proxyclient.py\n--- a/fedora/client/proxyclient.py\n+++ b/fedora/client/proxyclient.py\n@@ -20,32 +20,26 @@\n \n .. moduleauthor:: Luke Macken <lmacken@redhat.com>\n .. moduleauthor:: Toshio Kuratomi <tkuratom@redhat.com>\n+.. moduleauthor:: Ralph Bean <rbean@redhat.com>\n '''\n \n-import Cookie\n import copy\n-import urllib\n-import httplib\n import logging\n # For handling an exception that's coming from requests:\n import ssl\n import time\n import warnings\n \n-try:\n- from urlparse import urljoin\n- from urlparse import urlparse\n-except ImportError:\n- # Python3 support\n- from urllib.parse import urljoin\n- from urllib.parse import urlparse\n+import six.moves.http_client as httplib\n+import six.moves.http_cookies as Cookie\n+from six.moves.urllib_parse import quote, urljoin, urlparse\n \n try:\n from hashlib import sha1 as sha_constructor\n except ImportError:\n from sha import new as sha_constructor\n \n-from bunch import bunchify\n+from munch import munchify\n from kitchen.text.converters import to_bytes\n import requests\n \n@@ -321,7 +315,7 @@ def send_request(self, method, req_params=None, auth_params=None,\n # will work with it.\n method = method.lstrip('/')\n # And join to make our url.\n- url = urljoin(self.base_url, urllib.quote(method))\n+ url = urljoin(self.base_url, quote(method))\n \n data = None # decoded JSON via json.load()\n \n@@ -347,7 +341,7 @@ def send_request(self, method, req_params=None, auth_params=None,\n complete_params = req_params or {}\n if session_id:\n # Add the csrf protection token\n- token = sha_constructor(session_id)\n+ token = sha_constructor(to_bytes(session_id))\n complete_params.update({'_csrf_token': token.hexdigest()})\n \n auth = None\n@@ -497,7 +491,7 @@ def send_request(self, method, req_params=None, auth_params=None,\n # Compatibility with newer python-requests\n if callable(data):\n data = data()\n- except ValueError, e:\n+ except ValueError as e:\n # The response wasn't JSON data\n raise ServerError(\n url, http_status, 'Error returned from'\n@@ -516,7 +510,7 @@ def send_request(self, method, req_params=None, auth_params=None,\n new_session = cookie\n \n self.log.debug('proxyclient.send_request: exited')\n- data = bunchify(data)\n+ data = munchify(data)\n return new_session, data\n \n __all__ = (ProxyClient,)\ndiff --git a/fedora/client/wiki.py b/fedora/client/wiki.py\n--- a/fedora/client/wiki.py\n+++ b/fedora/client/wiki.py\n@@ -27,6 +27,7 @@\n .. moduleauthor:: Toshio Kuratomi <tkuratom@redhat.com>\n .. moduleauthor:: Ian Weller <ian@ianweller.org>\n '''\n+from __future__ import print_function\n \n from datetime import datetime, timedelta\n import time\n@@ -98,15 +99,15 @@ def check_api_limits(self):\n def print_recent_changes(self, days=7, show=10):\n now = datetime.utcnow()\n then = now - timedelta(days=days)\n- print _(u\"From %(then)s to %(now)s\") % {'then': then, 'now': now}\n+ print(_(u\"From %(then)s to %(now)s\") % {'then': then, 'now': now})\n changes = self.get_recent_changes(now=now, then=then)\n num_changes = len(changes)\n- print _(u\"%d wiki changes in the past week\") % num_changes\n+ print(_(u\"%d wiki changes in the past week\") % num_changes)\n if num_changes == 500:\n- print _(\n+ print(_(\n u\"\"\"Warning: Number of changes reaches the API return limit.\n You will not get the complete list of changes unless\n-you run this script using a 'bot' account.\"\"\")\n+you run this script using a 'bot' account.\"\"\"))\n \n users = {}\n pages = {}\n@@ -114,18 +115,18 @@ def print_recent_changes(self, days=7, show=10):\n users.setdefault(change['user'], []).append(change['title'])\n pages[change['title']] = pages.setdefault(change['title'], 0) + 1\n \n- print _(u'\\n== Most active wiki users ==')\n+ print(_(u'\\n== Most active wiki users =='))\n for user, changes in sorted(users.items(),\n cmp=lambda x, y: cmp(len(x[1]), len(y[1])),\n reverse=True)[:show]:\n- print u' %-50s %d' % (('%s' % user).ljust(50, '.'),\n- len(changes))\n+ print(u' %-50s %d' % (('%s' % user).ljust(50, '.'),\n+ len(changes)))\n \n- print _(u'\\n== Most edited pages ==')\n+ print(_(u'\\n== Most edited pages =='))\n for page, num in sorted(pages.items(),\n cmp=lambda x, y: cmp(x[1], y[1]),\n reverse=True)[:show]:\n- print u' %-50s %d' % (('%s' % page).ljust(50, '.'), num)\n+ print(u' %-50s %d' % (('%s' % page).ljust(50, '.'), num))\n \n def fetch_all_revisions(self, start=1, flags=True, timestamp=True,\n user=True, size=False, comment=True, content=False,\n@@ -165,13 +166,13 @@ def fetch_all_revisions(self, start=1, flags=True, timestamp=True,\n 'ids': True,\n }\n rvprop = '|'.join([key for key in rvprop_list if rvprop_list[key]])\n- revs_to_get = range(start, latest_revid)\n+ revs_to_get = list(range(start, latest_revid))\n all_revs = {}\n if self.api_high_limits:\n limit = 500\n else:\n limit = 50\n- for i in xrange(0, len(revs_to_get), limit):\n+ for i in range(0, len(revs_to_get), limit):\n revid_list = revs_to_get[i:i+limit]\n revid_str = '|'.join([str(rev) for rev in revid_list])\n data = self.send_request(\ndiff --git a/fedora/django/auth/models.py b/fedora/django/auth/models.py\n--- a/fedora/django/auth/models.py\n+++ b/fedora/django/auth/models.py\n@@ -20,12 +20,14 @@\n .. moduleauthor:: Ignacio Vazquez-Abrams <ivazquez@fedoraproject.org>\n .. moduleauthor:: Toshio Kuratomi <toshio@fedoraproject.org>\n '''\n+from __future__ import print_function\n from fedora.client import AuthError\n from fedora.django import connection, person_by_id\n from fedora import _\n \n import django.contrib.auth.models as authmodels\n from django.conf import settings\n+import six\n \n # Map FAS user elements to model attributes\n _fasmap = {\n@@ -49,22 +51,22 @@ def _syncdb_handler(sender, **kwargs):\n # Import FAS groups\n verbosity = kwargs.get('verbosity', 1)\n if verbosity > 0:\n- print _('Loading FAS groups...')\n+ print(_('Loading FAS groups...'))\n try:\n gl = connection.group_list({'username': settings.FAS_USERNAME,\n 'password': settings.FAS_PASSWORD})\n except AuthError:\n if verbosity > 0:\n- print _('Unable to load FAS groups. Did you set '\n- 'FAS_USERNAME and FAS_PASSWORD?')\n+ print(_('Unable to load FAS groups. Did you set '\n+ 'FAS_USERNAME and FAS_PASSWORD?'))\n else:\n groups = gl[1]['groups']\n for group in groups:\n _new_group(group)\n if verbosity > 0:\n- print _('FAS groups loaded. Don\\'t forget to set '\n+ print(_('FAS groups loaded. Don\\'t forget to set '\n 'FAS_USERNAME and FAS_PASSWORD to a low-privilege '\n- 'account.')\n+ 'account.'))\n \n \n class FasUserManager(authmodels.UserManager):\n@@ -77,7 +79,7 @@ def user_from_fas(self, user):\n log.write('in models user_from_fas\\n')\n log.close()\n d = {}\n- for k, v in _fasmap.iteritems():\n+ for k, v in six.iteritems(_fasmap):\n d[v] = user[k]\n u = FasUser(**d)\n u.set_unusable_password()\ndiff --git a/fedora/tg/identity/jsonfasprovider1.py b/fedora/tg/identity/jsonfasprovider1.py\n--- a/fedora/tg/identity/jsonfasprovider1.py\n+++ b/fedora/tg/identity/jsonfasprovider1.py\n@@ -227,7 +227,7 @@ def validate_identity(self, user_name, password, visit_key):\n user = JsonFasIdentity(visit_key,\n username=user_name,\n password=password)\n- except FedoraServiceError, e:\n+ except FedoraServiceError as e:\n log.warning('Error logging in %(user)s: %(error)s' % {\n 'user': to_bytes(user_name), 'error': to_bytes(e)})\n return None\ndiff --git a/fedora/tg/identity/jsonfasprovider2.py b/fedora/tg/identity/jsonfasprovider2.py\n--- a/fedora/tg/identity/jsonfasprovider2.py\n+++ b/fedora/tg/identity/jsonfasprovider2.py\n@@ -184,7 +184,7 @@ def __retrieve_user(self):\n # pylint: disable-msg=W0702\n try:\n data = self.send_request('user/view', auth=True)\n- except AuthError, e:\n+ except AuthError as e:\n # Failed to login with present credentials\n self._retrieved_user = self.session_id\n return None\n@@ -423,7 +423,7 @@ def validate_identity(self, user_name, password, visit_key):\n try:\n user = JsonFasIdentity(visit_key, username=user_name,\n password=password, using_ssl=using_ssl)\n- except FedoraServiceError, e:\n+ except FedoraServiceError as e:\n self.log.warning('Error logging in %(user)s: %(error)s' % {\n 'user': to_bytes(user_name), 'error': to_bytes(e)})\n return None\ndiff --git a/fedora/tg/utils.py b/fedora/tg/utils.py\n--- a/fedora/tg/utils.py\n+++ b/fedora/tg/utils.py\n@@ -47,6 +47,7 @@\n import turbogears.util as tg_util\n from turbogears.controllers import check_app_root\n from turbogears.identity.exceptions import RequestRequiredException\n+import six\n \n \n # Save this for people who need the original url() function\n@@ -113,7 +114,7 @@ def url(tgpath, tgparams=None, **kwargs):\n pass\n \n # Check for query params in the current url\n- query_params = tgparams.iteritems()\n+ query_params = six.iteritems(tgparams)\n scheme, netloc, path, params, query_s, fragment = urlparse.urlparse(tgpath)\n if query_s:\n query_params = chain((p for p in cgi.parse_qsl(query_s) if p[0] !=\ndiff --git a/fedora/tg/widgets.py b/fedora/tg/widgets.py\n--- a/fedora/tg/widgets.py\n+++ b/fedora/tg/widgets.py\n@@ -28,7 +28,7 @@\n try:\n import simplejson as json\n except ImportError:\n- import json as json\n+ from . import json as json\n \n from bugzilla import Bugzilla\n from turbogears.widgets import Widget\ndiff --git a/fedora/tg2/utils.py b/fedora/tg2/utils.py\n--- a/fedora/tg2/utils.py\n+++ b/fedora/tg2/utils.py\n@@ -36,7 +36,7 @@\n except ImportError:\n from sha import new as sha_constructor\n \n-from bunch import Bunch\n+from munch import Munch\n from kitchen.text.converters import to_unicode\n import pkg_resources\n from repoze.what.plugins.pylonshq import booleanize_predicates\n@@ -157,9 +157,9 @@ def add_fas_auth_middleware(self, app, *args):\n be authenticated against, set the connection to insecure for testing, and\n the url of the login form, do this::\n \n- from bunch import Bunch\n+ from munch import Munch\n class MyAppConfig(AppConfig):\n- fas_auth = Bunch(\n+ fas_auth = Munch(\n fas_url='https://fakefas.fedoraproject.org/accounts',\n insecure=True, login_form_url='/alternate/login')\n add_auth_middleware = add_fas_auth_middleware\n@@ -174,7 +174,7 @@ class MyAppConfig(AppConfig):\n booleanize_predicates()\n \n if not hasattr(self, 'fas_auth'):\n- self.fas_auth = Bunch()\n+ self.fas_auth = Munch()\n \n # Configuring auth logging:\n if 'log_stream' not in self.fas_auth:\ndiff --git a/fedora/urlutils.py b/fedora/urlutils.py\n--- a/fedora/urlutils.py\n+++ b/fedora/urlutils.py\n@@ -25,16 +25,15 @@\n .. moduleauthor:: Toshio Kuratomi <tkuratom@redhat.com>\n '''\n \n-from urlparse import urlparse, urlunparse\n-from urllib import urlencode\n-\n-from kitchen.iterutils import isiterable\n+from six.moves.urllib_parse import urlparse, urlunparse, urlencode\n \n try:\n- from urlparse import parse_qs\n+ from six.moves.urllib_parse import parse_qs\n except ImportError:\n from cgi import parse_qs\n \n+from kitchen.iterutils import isiterable\n+\n \n def update_qs(uri, new_params, overwrite=True):\n '''Helper function for updating query string values.\ndiff --git a/fedora/wsgi/csrf.py b/fedora/wsgi/csrf.py\n--- a/fedora/wsgi/csrf.py\n+++ b/fedora/wsgi/csrf.py\n@@ -31,7 +31,7 @@\n \n import logging\n \n-from bunch import Bunch\n+from munch import Munch\n from kitchen.text.converters import to_bytes\n from webob import Request\n try:\n@@ -147,7 +147,7 @@ def __call__(self, environ, start_response):\n log.debug('Clearing identity')\n self._clean_environ(environ)\n if 'repoze.who.identity' not in environ:\n- environ['repoze.who.identity'] = Bunch()\n+ environ['repoze.who.identity'] = Munch()\n if 'repoze.who.logins' not in environ:\n # For compatibility with friendlyform\n environ['repoze.who.logins'] = 0\ndiff --git a/fedora/wsgi/faswho/faswhoplugin.py b/fedora/wsgi/faswho/faswhoplugin.py\n--- a/fedora/wsgi/faswho/faswhoplugin.py\n+++ b/fedora/wsgi/faswho/faswhoplugin.py\n@@ -37,7 +37,7 @@\n import pkg_resources\n \n from beaker.cache import Cache\n-from bunch import Bunch\n+from munch import Munch\n from kitchen.text.converters import to_bytes, exception_to_bytes\n from paste.httpexceptions import HTTPFound\n from repoze.who.middleware import PluggableAuthenticationMiddleware\n@@ -228,7 +228,7 @@ def identify(self, environ):\n # This is compatible with TG1 and it gives us a way to authenticate\n # a user without making two requests\n query = req.GET\n- form = Bunch(req.POST)\n+ form = Munch(req.POST)\n form.update(query)\n if form.get('login', None) == 'Login' and \\\n 'user_name' in form and \\\n@@ -394,7 +394,7 @@ def add_metadata(self, environ, identity):\n identity.update(user_info)\n \n identity['userdata'] = user_info\n- identity['user'] = Bunch()\n+ identity['user'] = Munch()\n identity['user'].created = user_info['creation']\n identity['user'].display_name = user_info['human_name']\n identity['user'].email_address = user_info['email']\ndiff --git a/flask_fas_openid.py b/flask_fas_openid.py\n--- a/flask_fas_openid.py\n+++ b/flask_fas_openid.py\n@@ -28,7 +28,7 @@\n '''\n from functools import wraps\n \n-from bunch import Bunch\n+from munch import Munch\n import flask\n try:\n from flask import _app_ctx_stack as stack\n@@ -176,8 +176,8 @@ def _check_session(self):\n for group in user['groups']:\n membership = dict()\n membership['name'] = group\n- user['approved_memberships'].append(Bunch.fromDict(membership))\n- flask.g.fas_user = Bunch.fromDict(user)\n+ user['approved_memberships'].append(Munch.fromDict(membership))\n+ flask.g.fas_user = Munch.fromDict(user)\n flask.g.fas_user.groups = frozenset(flask.g.fas_user.groups)\n flask.g.fas_session_id = 0\n \n@@ -223,7 +223,7 @@ def login(self, username=None, password=None, return_url=None,\n oidconsumer = consumer.Consumer(session, None)\n try:\n request = oidconsumer.begin(self.app.config['FAS_OPENID_ENDPOINT'])\n- except consumer.DiscoveryFailure, exc:\n+ except consumer.DiscoveryFailure as exc:\n # VERY strange, as this means it could not discover an OpenID\n # endpoint at FAS_OPENID_ENDPOINT\n return 'discoveryfailure'\ndiff --git a/releaseutils.py b/releaseutils.py\n--- a/releaseutils.py\n+++ b/releaseutils.py\n@@ -19,6 +19,7 @@\n import pkg_resources\n \n import fedora.release\n+from six.moves import map\n \n \n #\n@@ -72,7 +73,7 @@ def build_catalogs():\n \n try:\n shutil.rmtree('locale')\n- except OSError, e:\n+ except OSError as e:\n # If the error is that locale does not exist, we're okay. We're\n # deleting it here, afterall\n if e.errno != 2:\n@@ -115,7 +116,7 @@ def _install_catalogs(localedir):\n dirname = os.path.dirname(catalog)\n dst = os.path.join(localedir, dirname)\n try:\n- os.makedirs(dst, 0755)\n+ os.makedirs(dst, 0o755)\n except OSError as e:\n # Only allow file exists to pass\n if e.errno != 17:\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n # and barf. So we have to delete it here.\n del __requires__\n \n-execfile(\"fedora/release.py\")\n+exec(compile(open(\"fedora/release.py\").read(), \"fedora/release.py\", 'exec'))\n \n from setuptools import find_packages, setup\n \n@@ -31,7 +31,7 @@\n # non-setuptools package. When everything we care about uses\n # python-2.5 distutils we can add these:\n # for bodhi (koji yum)\n- install_requires=['bunch', 'kitchen', 'requests', 'beautifulsoup4', 'urllib3'],\n+ install_requires=['munch', 'kitchen', 'requests', 'beautifulsoup4', 'urllib3', 'six'],\n extras_require={\n 'tg': ['TurboGears >= 1.0.4', 'SQLAlchemy', 'decorator'],\n 'wsgi': ['repoze.who', 'Beaker', 'Paste'],\n", "test_patch": "diff --git a/test_requirements.txt b/test_requirements.txt\nnew file mode 100644\n--- /dev/null\n+++ b/test_requirements.txt\n@@ -0,0 +1 @@\n+nose\ndiff --git a/tests/__init__.py b/tests/__init__.py\nnew file mode 100644\ndiff --git a/tests/functional/__init__.py b/tests/functional/__init__.py\nnew file mode 100644\ndiff --git a/tests/functional/functional_test_utils.py b/tests/functional/functional_test_utils.py\nnew file mode 100644\n--- /dev/null\n+++ b/tests/functional/functional_test_utils.py\n@@ -0,0 +1,31 @@\n+import functools\n+import os\n+\n+from nose.exc import SkipTest\n+\n+try:\n+ from nose.tools.nontrivial import make_decorator\n+except ImportError:\n+ # It lives here in older versions of nose (el6)\n+ from nose.tools import make_decorator\n+\n+\n+def _asbool(s):\n+ return s.lower() in ['y', 'yes', 'true', '1']\n+\n+\n+def networked(func):\n+ \"\"\"A decorator that skips tests if $NETWORKED is false or undefined.\n+\n+ This decorator allows us to have tests that a developer might want to\n+ run but shouldn't be run by random people building the package. It\n+ also makes non-networked build systems happy.\n+ \"\"\"\n+ @functools.wraps(func)\n+ def newfunc(self, *args, **kw):\n+ if not _asbool(os.environ.get('NETWORKED', 'False')):\n+ raise SkipTest('Only run if you have network access.')\n+ return func(self, *args, **kw)\n+ return make_decorator(func)(newfunc)\n+\n+\ndiff --git a/tests/test_openidbaseclient.py b/tests/functional/test_openidbaseclient.py\nsimilarity index 68%\nrename from tests/test_openidbaseclient.py\nrename to tests/functional/test_openidbaseclient.py\n--- a/tests/test_openidbaseclient.py\n+++ b/tests/functional/test_openidbaseclient.py\n@@ -1,6 +1,4 @@\n-#!/usr/bin/python2 -tt\n # -*- coding: utf-8 -*-\n-\n \"\"\" Test the OpenIdBaseClient. \"\"\"\n \n \n@@ -8,9 +6,8 @@\n import shutil\n import tempfile\n import unittest\n-import functools\n \n-from nose.exc import SkipTest\n+from .functional_test_utils import networked\n \n from fedora.client import FedoraServiceError\n from fedora.client.openidbaseclient import OpenIdBaseClient\n@@ -19,29 +16,6 @@\n BASE_URL = 'http://209.132.184.188'\n LOGIN_URL = '{}/login/'.format(BASE_URL)\n \n-try:\n- from nose.tools.nontrivial import make_decorator\n-except ImportError:\n- # It lives here in older versions of nose (el6)\n- from nose.tools import make_decorator\n-\n-\n-def dev_only(func):\n- \"\"\"A decorator that skips tests if they are not run by a developer.\n-\n- This decorator allows us to have tests that a developer might want to\n- run but shouldn't be run by random people building the package. It\n- also makes non-networked build systems happy.\n-\n- \"\"\"\n- @functools.wraps(func)\n- def newfunc(self, *args, **kw):\n- if not os.environ.get('DEVELOPER_TESTS', None):\n- raise SkipTest('Only run if you are a python-fedora developer')\n- return func(self, *args, **kw)\n- return make_decorator(func)(newfunc)\n-\n-\n class OpenIdBaseClientTest(unittest.TestCase):\n \n \"\"\"Test the OpenId Base Client.\"\"\"\n@@ -77,12 +51,12 @@ def restore_cookies(self):\n if self.saved_session_file:\n shutil.move(self.saved_session_file, self.session_file)\n \n- @dev_only\n+ @networked\n def test_no_openid_session(self):\n \"\"\"Raise FedoraServiceError for no session on service or openid server.\"\"\"\n self.assertRaises(FedoraServiceError, self.client.login, 'username', 'password')\n \n- @dev_only\n+ @networked\n def test_no_service_session(self):\n \"\"\"Open a service session when we have an openid session.\"\"\"\n pass\ndiff --git a/tests/test_urlutils.py b/tests/test_urlutils.py\nnew file mode 100644\n--- /dev/null\n+++ b/tests/test_urlutils.py\n@@ -0,0 +1,53 @@\n+#!/usr/bin/python2 -tt\n+# -*- coding: utf-8 -*-\n+\n+\"\"\" Test the OpenIdBaseClient. \"\"\"\n+\n+import unittest\n+\n+from fedora.urlutils import update_qs\n+\n+base = 'http://threebean.org/'\n+\n+class TestURLUtils(unittest.TestCase):\n+ def test_simple_add(self):\n+ original = base\n+ expected = base + \"?foo=yes\"\n+ params = dict(foo=\"yes\")\n+ actual = update_qs(original, params)\n+ self.assertEquals(actual, expected)\n+\n+ def test_simple_idempotence(self):\n+ original = base + \"?foo=yes\"\n+ expected = base + \"?foo=yes\"\n+ params = dict(foo=\"yes\")\n+ actual = update_qs(original, params)\n+ self.assertEquals(actual, expected)\n+\n+ def test_simple_with_overwrite(self):\n+ original = base + \"?foo=yes\"\n+ expected = base + \"?foo=no\"\n+ params = dict(foo=\"no\")\n+ actual = update_qs(original, params)\n+ self.assertEquals(actual, expected)\n+\n+ def test_simple_without_overwrite(self):\n+ original = base + \"?foo=yes\"\n+ expected = base + \"?foo=yes&foo=no\"\n+ params = dict(foo=\"no\")\n+ actual = update_qs(original, params, overwrite=False)\n+ self.assertEquals(actual, expected)\n+\n+ def test_simple_without_overwrite_and_same(self):\n+ original = base + \"?foo=yes\"\n+ expected = base + \"?foo=yes&foo=yes\"\n+ params = dict(foo=\"yes\")\n+ actual = update_qs(original, params, overwrite=False)\n+ self.assertEquals(actual, expected)\n+\n+ def test_simple_with_tuples(self):\n+ original = base\n+ expected = base + \"?foo=yes\"\n+ params = [('foo', 'yes')]\n+ actual = update_qs(original, params)\n+ self.assertEquals(actual, expected)\n", "problem_statement": "", "hints_text": "", "created_at": "2015-04-08T19:49:41Z"}
|