valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,123 Commits 24 Branches 182 Tags 341 MiB
131df72a6f
Commit Graph

502 Commits

Author SHA1 Message Date
Justin Anderson
c6a1d8b7ba Changed /tmp/ to /home/ user.present test 2016-03-31 15:13:58 -06:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
Justin Anderson
a0d1f42337 Lint fix 2016-03-24 16:33:18 -06:00
Justin Anderson
291a5695d3 Arch does not have the alternatives directory 2016-03-24 16:12:01 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -06:00
Justin Anderson
e86797731a Removed some unused imports for lint fixes 2016-03-22 09:15:20 -06:00
Andreas Lutro
e9fe661e72 add integration test for alternatives state 
the alternatives state module has been through some contradictory
changes recently. an integration test should help validate that it
actually works.
 2016-03-21 17:53:01 +01:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
Justin Findlay
e0abe23c7e states.ssh int tests: run both test cases manually 2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984 states.pkg int tests: add pkgs for MacOS 2016-03-10 10:57:21 -07:00
Justin Findlay
431a247b66 states.cmd int tests: echo is more portable than true 2016-03-10 10:57:21 -07:00
Justin Findlay
7c48cf7ea6 states.user int tests: check MacOS primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
5d5ce619b7 states.user int tests: disable GECOS for MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
aa61e1056f states.file int tests: find root's primary group 2016-03-10 10:57:20 -07:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
 2016-03-06 10:59:46 -07:00
Erik Johnson
da954d7b92 Add integration test for packages with epoch in version 
This starts with cent7, but later I can add cent6 as well.
 2016-03-03 15:40:22 -06:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Ch3LL
a387d175d8 integartion test- ensure decorator only runs on one method and not entire class 2016-02-25 01:55:35 +09:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Mike Place
3832f9b874 Merge pull request #30979 from dschaller/npm-cache-clean 
Adding NPM cache_cleaned state & module functions
 2016-02-18 14:51:04 -07:00
Mike Place
b40c611d0d Merge pull request #31067 from jfindlay/deprecate_env 
Deprecate env
 2016-02-18 14:42:10 -07:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
Justin Findlay
728f4e6c05 tests/integration/states/compiler.py: remove env support 2016-02-16 20:33:23 -07:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
Ch3LL
a12e2f566b fix lint error 2016-02-12 11:38:29 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
justinta89
56efb2d06a File state born deprecations. 
Backport of #30988
 2016-02-08 10:13:15 -07:00
abednarik
b20738a5a1 File state born deprecations. 
Removed all Boron warning and deprecated code.
 2016-02-08 10:01:28 -03:00
Derek Schaller
de154d76ce Adding npm cache_cleaned state and required module functions 2016-02-06 15:27:00 -08:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00
justinta89
f947e1e549 Adjusted the expected output to match the actual results 2015-11-19 11:32:18 -07:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Jonathan Ballet
6d95cbc998 Fix lint errors 2015-10-07 17:49:07 +02:00
Jonathan Ballet
4ff9f4be2a Fix file.directory with clean=true and require_in with states ID 
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.

Fix #8646
 2015-10-07 14:53:04 +02:00
Jonathan Ballet
0d391275de Test cases to demonstrate bug #8646 2015-10-07 12:06:35 +02:00
Matti Niemenmaa
8eb5036f1f states.file: allow prepending to non-existent file (#27401) 
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
 2015-09-27 09:06:51 +03:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Erik Johnson
37c8852584 Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05:00
Erik Johnson
b401328558 tests/integration/states/ssh.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
8053d1f952 tests/integration/states/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Mike Place
35d6ae2be7 Use with 2015-08-12 12:14:12 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Mike Place
bbc6f84c75 Merge pull request #26105 from cachedout/fix_25221 
Fix failing test
 2015-08-07 12:11:10 -06:00
Mike Place
1a18013330 Fix failing test 2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6 Merge pull request #25221 from jet9/istextfile_utf8 
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
 2015-08-07 12:10:27 -06:00
Andreas Lutro
ceda2b7274 users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02:00
Dmitry Kurbatov
2a349ff102 Extend salt.utils.istextfile() with utf-8 instead of binary detection 2015-08-07 10:06:20 +03:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jason Hamner
24f653e963 Integration Test for Issue 25250 
Adds integration test for #25250
 2015-07-24 13:28:15 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Pedro Algarvio
c4b15840c6 Additional test case for question raised in #1846 
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
 2015-07-15 14:29:43 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
6f238e924c integration test file.managed sources 2015-06-30 14:26:59 -06:00
Doug Luce
6fe47ea1f4 Allow URL specification of NPM packages 
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError.  Assume that not every package installed globally is
specified with a URL.

Example failing state:

kvsio:
  npm.installed:
      - name: git+ssh://github.com/dougluce/kvs.io.git
 2015-05-26 13:19:17 -07:00
Justin Findlay
f58f3dac1d integration test for char escaping in file paths 2015-05-04 23:24:45 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
 2015-04-24 10:19:03 -06:00
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
 2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7 
Test with a more recent pip version to avoid a traceback
 2015-04-22 10:25:17 -06:00
Pedro Algarvio
bc87749e2c Test with a more recent pip version to avoid a traceback 
```
07:39:05,449 [salt.minion                                :1178][ERROR   ] A command in 'pip.list' had a problem: Traceback (most recent call last):
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
    load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
    return ep.load()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
    return self.resolve()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
    from pip.commands import commands, get_similar_commands, get_summaries
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
    from pip.commands.bundle import BundleCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
    from pip.commands.install import InstallCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
    from pip.req import InstallRequirement, RequirementSet, parse_requirements
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
    from .req_install import InstallRequirement
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
    import pip.wheel
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
    from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
 2015-04-22 16:13:58 +01:00
Viet Hung Nguyen
b13db32fde add test for #18843 2015-04-22 16:21:23 +07:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Justin Findlay
56364ff571 adding cmd.run state integration tests 2015-04-06 20:32:22 -06:00
Pedro Algarvio
ff4aa5b989 Include unless in the state internal keywords. 
Fixes #22359
 2015-04-05 01:00:08 +01:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Colton Myers
8c1fa5358e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/debian_ip.py
	salt/modules/file.py
	salt/states/ssh_auth.py
	salt/utils/cloud.py
 2015-03-09 11:50:21 -06:00
Viet Hung Nguyen
2a845989b7 bugfix: fix test mode in ssh_known_hosts 
- present func: should not require key/fingerprint.
  In normal mode, key AND fingerprint can be omitted but
  test mode requires them, so fix the test mode to behave same
  way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
 2015-03-07 00:58:32 +07:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
Pedro Algarvio
ff636249f4 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00