[Python-modules-commits] [geopy] 04/06: merge patched into master
Daniele Tricoli
eriol-guest at moszumanska.debian.org
Fri Nov 6 15:34:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriol-guest pushed a commit to branch master
in repository geopy.
commit f2d57106e90c71398816d5c674a24b8f9e818125
Merge: cea9942 285387b
Author: Daniele Tricoli <eriol at mornie.org>
Date: Fri Nov 6 15:14:26 2015 +0100
merge patched into master
LICENSE | 3 +-
PKG-INFO | 9 +-
README | 23 +-
debian/.git-dpm | 6 +-
.../patches/04_use_lt_and_eq_instead_of_cmp.patch | 6 +-
geopy.egg-info/PKG-INFO | 9 +-
geopy.egg-info/SOURCES.txt | 18 +-
geopy.egg-info/pbr.json | 1 +
geopy.egg-info/top_level.txt | 2 +-
geopy/__init__.py | 6 +-
geopy/__init__.pyc | Bin 602 -> 0 bytes
geopy/compat.py | 55 ++-
geopy/compat.pyc | Bin 1764 -> 0 bytes
geopy/distance.py | 28 +-
geopy/distance.pyc | Bin 16468 -> 0 bytes
geopy/exc.pyc | Bin 4006 -> 0 bytes
geopy/format.pyc | Bin 4453 -> 0 bytes
geopy/geocoders/__init__.py | 31 +-
geopy/geocoders/__init__.pyc | Bin 5644 -> 0 bytes
geopy/geocoders/arcgis.py | 10 +-
geopy/geocoders/arcgis.pyc | Bin 8525 -> 0 bytes
geopy/geocoders/baidu.py | 3 +-
geopy/geocoders/baidu.pyc | Bin 6741 -> 0 bytes
geopy/geocoders/base.py | 34 +-
geopy/geocoders/base.pyc | Bin 5110 -> 0 bytes
geopy/geocoders/bing.py | 80 ++-
geopy/geocoders/bing.pyc | Bin 6291 -> 0 bytes
geopy/geocoders/databc.py | 115 +++++
geopy/geocoders/dot_us.py | 5 +-
geopy/geocoders/dot_us.pyc | Bin 5139 -> 0 bytes
geopy/geocoders/geocodefarm.py | 82 ++--
geopy/geocoders/geocodefarm.pyc | Bin 6112 -> 0 bytes
geopy/geocoders/geonames.py | 11 +-
geopy/geocoders/geonames.pyc | Bin 5853 -> 0 bytes
geopy/geocoders/googlev3.py | 44 +-
geopy/geocoders/googlev3.pyc | Bin 11603 -> 0 bytes
geopy/geocoders/ignfrance.py | 541 +++++++++++++++++++++
geopy/geocoders/mapquest.py | 131 -----
geopy/geocoders/mapquest.pyc | Bin 4659 -> 0 bytes
geopy/geocoders/navidata.py | 197 ++++++++
geopy/geocoders/opencage.py | 7 +-
geopy/geocoders/opencage.pyc | Bin 7115 -> 0 bytes
geopy/geocoders/openmapquest.py | 3 +-
geopy/geocoders/openmapquest.pyc | Bin 4399 -> 0 bytes
geopy/geocoders/osm.py | 33 +-
geopy/geocoders/osm.pyc | Bin 8175 -> 0 bytes
geopy/geocoders/photon.py | 225 +++++++++
geopy/geocoders/placefinder.py | 19 +-
geopy/geocoders/placefinder.pyc | Bin 5894 -> 0 bytes
geopy/geocoders/smartystreets.py | 38 +-
geopy/geocoders/smartystreets.pyc | Bin 4848 -> 0 bytes
geopy/geocoders/what3words.py | 272 +++++++++++
geopy/geocoders/{geonames.py => yandex.py} | 129 +++--
geopy/location.py | 4 +-
geopy/location.pyc | Bin 4609 -> 0 bytes
geopy/point.py | 17 +-
geopy/point.pyc | Bin 12223 -> 0 bytes
geopy/units.pyc | Bin 3154 -> 0 bytes
geopy/util.py | 10 +
geopy/util.pyc | Bin 2753 -> 0 bytes
setup.py | 9 +-
61 files changed, 1855 insertions(+), 361 deletions(-)
diff --cc debian/.git-dpm
index 8ca9d2b,0000000..b865f66
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- a1e1d3c95e6e8c2c14b52fe86489ea8cfc15b416
- a1e1d3c95e6e8c2c14b52fe86489ea8cfc15b416
- 477afb5ce4a66ec196e5ecde1ea73c0e73e688a5
++285387babdd8f465613ccdd0c24d8be0d40f44b1
++285387babdd8f465613ccdd0c24d8be0d40f44b1
++9ea482b25e29611285d36c86bb79a9371fe1fd7d
+9ea482b25e29611285d36c86bb79a9371fe1fd7d
+geopy_1.11.0+ds1.orig.tar.gz
+153099aed5949d3f66fdc4ae207d9d8049a9dea8
+43062
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/04_use_lt_and_eq_instead_of_cmp.patch
index 7a0d6ab,0000000..dc67f14
mode 100644,000000..100644
--- a/debian/patches/04_use_lt_and_eq_instead_of_cmp.patch
+++ b/debian/patches/04_use_lt_and_eq_instead_of_cmp.patch
@@@ -1,37 -1,0 +1,37 @@@
- From a1e1d3c95e6e8c2c14b52fe86489ea8cfc15b416 Mon Sep 17 00:00:00 2001
++From 285387babdd8f465613ccdd0c24d8be0d40f44b1 Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol at mornie.org>
+Date: Thu, 8 Oct 2015 09:14:11 -0700
+Subject: Use __lt__() and __eq__() instead of __cmp__() and cmp()
+
+Last-Update: 2014-02-13
+
+Patch-Name: 04_use_lt_and_eq_instead_of_cmp.patch
+---
+ geopy/distance.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/geopy/distance.py b/geopy/distance.py
- index e8abc57..95dd127 100644
++index 3530148..07ae215 100644
+--- a/geopy/distance.py
++++ b/geopy/distance.py
- @@ -155,11 +155,17 @@ class Distance(object):
++@@ -162,11 +162,17 @@ class Distance(object):
+ def __str__(self): # pragma: no cover
+ return '%s km' % self.__kilometers
+
+- def __cmp__(self, other):
++ def __lt__(self, other):
+ if isinstance(other, Distance):
+- return cmp(self.kilometers, other.kilometers)
++ return self.kilometers < other.kilometers
+ else:
+- return cmp(self.kilometers, other)
++ return self.kilometers < other
++
++ def __eq__(self, other):
++ if isinstance(other, Distance):
++ return self.kilometers == other.kilometers
++ else:
++ return self.kilometers == other
+
+ @property
+ def kilometers(self): # pylint: disable=C0111
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/geopy.git
More information about the Python-modules-commits
mailing list