FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Yay, now we actually have 2.6 support! · python-webuntis/python-webuntis@41476d1 · GitHub

/ python-webuntis Public

Commit 41476d1

Browse files
untitaker
committed
Yay, now we actually have 2.6 support!
1 parent 2dde2ea commit 41476d1

6 files changed

Lines changed: 21 additions & 29 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
.tox
66
__pycache__
77
dist
8-
dist/
98
docs/_build/
109
env
1110
env*

‎setup.py‎

100755100644
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
#!/usr/bin/env python
22

3-
from setuptools import setup
3+
from setuptools import setup, find_packages
44
from sys import version_info
55

6+
dependencies = []
7+
68
if version_info < (2,6):
7-
dependencies = ['simplejson']
8-
else:
9-
dependencies = []
9+
dependencies.append('simplejson')
10+
11+
if version_info < (2,7):
12+
dependencies.append('ordereddict')
1013

1114
setup(
1215
name='webuntis',
1316
version='0.1.0',
1417
author='Markus Unterwaditzer',
1518
author_email='markus@unterwaditzer.net',
16-
packages=['webuntis', 'webuntis.utils', 'webuntis.tests'],
19+
packages=['webuntis', 'webuntis.tests'],
1720
include_package_data=True,
1821
url='http://dev.unterwaditzer.net/python-webuntis/',
1922
license='new-style BSD',
2023
description='Bindings for WebUntis API',
2124
long_description=open('README.rst').read(),
22-
install_requires=dependencies
25+
install_requires=dependencies,
26+
test_suite='webuntis.tests'
2327
)

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist=py27,py32,pypy
2+
envlist=py26,py27,py32,pypy
33

44
[testenv]
55
commands=python run-tests.py

‎webuntis/session.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121

2222
try:
23-
import json
23+
import json # Python >= 2.6
2424
except ImportError:
25-
import simplejson as json
25+
import simplejson as json # from dependency "simplejson"
2626

2727

2828
class JSONRPCSession(object):

‎webuntis/tests/__init__.py‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,8 @@ def test_getklassen_mock(self):
112112

113113
self.assertEqual(klassen.filter(id=129)[0].id, 129)
114114
self.assertEqual(
115-
{129,130,137},
116-
set(
117-
kl.id for kl in
118-
klassen.filter(id={129,130,137})
119-
)
120-
)
121-
self.assertEqual(
122-
{129,130,137},
123-
set(
124-
kl.id for kl in
125-
klassen.filter(id=[129,130,137])
126-
)
127-
)
128-
self.assertEqual(
129-
{129,130,137},
130-
set(
115+
[129,130,137],
116+
sorted(
131117
kl.id for kl in
132118
klassen.filter(id=(129,130,137))
133119
)

‎webuntis/utils/__init__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
'''
77

88
from __future__ import unicode_literals
9-
from collections import OrderedDict
9+
try:
10+
from collections import OrderedDict # Python >= 2.7
11+
except ImportError:
12+
from ordereddict import OrderedDict # from dependency "ordereddict"
1013

1114
from . import datetime_utils, option_utils
1215

@@ -67,9 +70,9 @@ def __getitem__(self, name):
6770
# every Option subclass has this
6871
return dict.__getitem__(self, name)
6972
elif name in self.filters:
70-
raise KeyError('No value for key: {}'.format(name))
73+
raise KeyError('No value for key: ' + name)
7174
else:
72-
raise KeyError('No value or filter for key: {}'.format(name))
75+
raise KeyError('No value or filter for key: ' + name)
7376

7477
def __setitem__(self, key, value):
7578
new_value = self.filters[key](value)

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL