Skip to content

gerrit-406405-4 #2146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

gerrit-406405-4 #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 57 additions & 42 deletions pywikibot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ def precision(self):
u"""
Return the precision of the geo coordinate.

The precision is calculated if the Coordinate does not have a precision,
and self._dim is set.
The precision is calculated if the Coordinate does not have a
precision, and self._dim is set.

When no precision and no self._dim exists, None is returned.

Expand All @@ -385,13 +385,15 @@ def precision(self):

In small angle approximation (and thus in radians):

M{Δλ ≈ Δpos / r_φ}, where r_φ is the radius of earth at the given latitude.
M{Δλ ≈ Δpos / r_φ}, where r_φ is the radius of earth at the given
latitude.
Δλ is the error in longitude.

M{r_φ = r cos φ}, where r is the radius of earth, φ the latitude

Therefore::
precision = math.degrees(self._dim/(radius*math.cos(math.radians(self.lat))))
precision = math.degrees(
self._dim/(radius*math.cos(math.radians(self.lat))))

@rtype: float or None
"""
Expand All @@ -408,19 +410,24 @@ def precision(self, value):
self._precision = value

def precisionToDim(self):
"""Convert precision from Wikibase to GeoData's dim and return the latter.
"""
Convert precision from Wikibase to GeoData's dim and return the latter.

dim is calculated if the Coordinate doesn't have a dimension, and precision is set.
When neither dim nor precision are set, ValueError is thrown.
dim is calculated if the Coordinate doesn't have a dimension, and
precision is set. When neither dim nor precision are set, ValueError
is thrown.

Carrying on from the earlier derivation of precision, since
precision = math.degrees(dim/(radius*math.cos(math.radians(self.lat)))), we get
dim = math.radians(precision)*radius*math.cos(math.radians(self.lat))
But this is not valid, since it returns a float value for dim which is an integer.
We must round it off to the nearest integer.
precision = math.degrees(dim/(radius*math.cos(math.radians(self.lat))))
we get:
dim = math.radians(
precision)*radius*math.cos(math.radians(self.lat))
But this is not valid, since it returns a float value for dim which is
an integer. We must round it off to the nearest integer.

Therefore::
dim = int(round(math.radians(precision)*radius*math.cos(math.radians(self.lat))))
dim = int(round(math.radians(
precision)*radius*math.cos(math.radians(self.lat))))

@rtype: int or None
"""
Expand All @@ -430,7 +437,8 @@ def precisionToDim(self):
radius = 6378137
self._dim = int(
round(
math.radians(self._precision) * radius * math.cos(math.radians(self.lat))
math.radians(self._precision) * radius * math.cos(
math.radians(self.lat))
)
)
return self._dim
Expand Down Expand Up @@ -496,11 +504,15 @@ def __init__(self, year=None, month=None, day=None,
readable string, e.g., 'hour'. If no precision is given, it is set
according to the given time units.

Timezone information is given in three different ways depending on the time:
* Times after the implementation of UTC (1972): as an offset from UTC in minutes;
* Times before the implementation of UTC: the offset of the time zone from universal time;
* Before the implementation of time zones: The longitude of the place of
the event, in the range −180° to 180°, multiplied by 4 to convert to minutes.
Timezone information is given in three different ways depending on the
time:
* Times after the implementation of UTC (1972): as an offset from UTC
in minutes;
* Times before the implementation of UTC: the offset of the time zone
from universal time;
* Before the implementation of time zones: The longitude of the place
of the event, in the range −180° to 180°, multiplied by 4 to convert
to minutes.

@param year: The year as a signed integer of between 1 and 16 digits.
@type year: long
Expand All @@ -516,11 +528,11 @@ def __init__(self, year=None, month=None, day=None,
@type second: int
@param precision: The unit of the precision of the time.
@type precision: int or str
@param before: Number of units after the given time it could be, if uncertain.
The unit is given by the precision.
@param before: Number of units after the given time it could be, if
uncertain. The unit is given by the precision.
@type before: int
@param after: Number of units before the given time it could be, if uncertain.
The unit is given by the precision.
@param after: Number of units before the given time it could be, if
uncertain. The unit is given by the precision.
@type after: int
@param timezone: Timezone information in minutes.
@type timezone: int
Expand Down Expand Up @@ -583,18 +595,19 @@ def fromTimestr(cls, datetimestr, precision=14, before=0, after=0,
The timestamp differs from ISO 8601 in that:
* The year is always signed and having between 1 and 16 digits;
* The month, day and time are zero if they are unknown;
* The Z is discarded since time zone is determined from the timezone param.
* The Z is discarded since time zone is determined from the timezone
param.

@param datetimestr: Timestamp in a format resembling ISO 8601,
e.g. +2013-01-01T00:00:00Z
@type datetimestr: str
@param precision: The unit of the precision of the time.
@type precision: int or str
@param before: Number of units after the given time it could be, if uncertain.
The unit is given by the precision.
@param before: Number of units after the given time it could be, if
uncertain. The unit is given by the precision.
@type before: int
@param after: Number of units before the given time it could be, if uncertain.
The unit is given by the precision.
@param after: Number of units before the given time it could be, if
uncertain. The unit is given by the precision.
@type after: int
@param timezone: Timezone information in minutes.
@type timezone: int
Expand Down Expand Up @@ -623,11 +636,11 @@ def fromTimestamp(cls, timestamp, precision=14, before=0, after=0,
@type timestamp: pywikibot.Timestamp
@param precision: The unit of the precision of the time.
@type precision: int or str
@param before: Number of units after the given time it could be, if uncertain.
The unit is given by the precision.
@param before: Number of units after the given time it could be, if
uncertain. The unit is given by the precision.
@type before: int
@param after: Number of units before the given time it could be, if uncertain.
The unit is given by the precision.
@param after: Number of units before the given time it could be, if
uncertain. The unit is given by the precision.
@type after: int
@param timezone: Timezone information in minutes.
@type timezone: int
Expand Down Expand Up @@ -668,7 +681,8 @@ def toTimestamp(self):
@return: Timestamp
@rtype: pywikibot.Timestamp

@raises ValueError: instance value can not be represented using Timestamp
@raises ValueError: instance value can not be represented using
Timestamp
"""
if self.year <= 0:
raise ValueError('You cannot turn BC dates into a Timestamp')
Expand Down Expand Up @@ -716,7 +730,7 @@ class WbQuantity(_WbRepresentation):
@staticmethod
def _require_errors(site):
"""
Check if the Wikibase site is so old it requires error bounds to be given.
Check if Wikibase site is so old it requires error bounds to be given.

If no site item is supplied it raises a warning and returns True.

Expand All @@ -729,7 +743,8 @@ def _require_errors(site):
"WbQuantity now expects a 'site' parameter. This is needed to "
"ensure correct handling of error bounds.")
return False
return MediaWikiVersion(site.version()) < MediaWikiVersion('1.29.0-wmf.2')
return MediaWikiVersion(
site.version()) < MediaWikiVersion('1.29.0-wmf.2')

@staticmethod
def _todecimal(value):
Expand Down Expand Up @@ -768,14 +783,14 @@ def __init__(self, amount, unit=None, error=None, site=None):
Create a new WbQuantity object.

@param amount: number representing this quantity
@type amount: string or Decimal. Other types are accepted, and converted
via str to Decimal.
@type amount: string or Decimal. Other types are accepted, and
converted via str to Decimal.
@param unit: the Wikibase item for the unit or the entity URI of this
Wikibase item.
Wikibase item.
@type unit: pywikibot.ItemPage, str or None
@param error: the uncertainty of the amount (e.g. ±1)
@type error: same as amount, or tuple of two values, where the first value is
the upper error and the second is the lower error value.
@type error: same as amount, or tuple of two values, where the first
value is the upper error and the second is the lower error value.
@param site: The Wikibase site
@type site: pywikibot.site.DataSite
"""
Expand Down Expand Up @@ -909,7 +924,7 @@ def toWikibase(self):
@classmethod
def fromWikibase(cls, wb):
"""
Create a WbMonolingualText from the JSON data given by the Wikibase API.
Create a WbMonolingualText from the JSON data given by Wikibase API.

@param wb: Wikibase JSON
@type wb: dict
Expand Down Expand Up @@ -1320,8 +1335,8 @@ def _flush(stop=True):
"""
Drop this process from the throttle log, after pending threads finish.

Wait for the page-putter to flush its queue. Also drop this process from the
throttle log. Called automatically at Python exit.
Wait for the page-putter to flush its queue. Also drop this process from
the throttle log. Called automatically at Python exit.
"""
_logger = "wiki"

Expand Down
20 changes: 12 additions & 8 deletions pywikibot/config2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"""
#
# (C) Rob W.W. Hooft, 2003
# (C) Pywikibot team, 2003-2017
# (C) Pywikibot team, 2003-2018
#
# Distributed under the terms of the MIT license.
#
Expand Down Expand Up @@ -358,9 +358,11 @@ def exists(directory):
if __no_user_config != '2':
output(exc_text)
else:
exc_text += " Please check that user-config.py is stored in the correct location.\n"
exc_text += " Directory where user-config.py is searched is determined as follows:\n\n"
exc_text += " " + get_base_dir.__doc__
exc_text += (
' Please check that user-config.py is stored in the correct '
'location.\n'
' Directory where user-config.py is searched is determined '
'as follows:\n\n ') + get_base_dir.__doc__
raise RuntimeError(exc_text)

return base_dir
Expand Down Expand Up @@ -391,7 +393,8 @@ def register_families_folder(folder_path):
for file_name in os.listdir(folder_path):
if file_name.endswith("_family.py"):
family_name = file_name[:-len("_family.py")]
register_family_file(family_name, os.path.join(folder_path, file_name))
register_family_file(family_name, os.path.join(folder_path,
file_name))


# Get the names of all known families, and initialize with empty dictionaries.
Expand Down Expand Up @@ -928,7 +931,8 @@ def shortpath(path):

def _win32_extension_command(extension):
"""Get the command from the Win32 registry for an extension."""
fileexts_key = r'Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts'
fileexts_key = \
r'Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts'
key_name = fileexts_key + r'\.' + extension + r'\OpenWithProgids'
_winreg = winreg # exists for git blame only; do not use
try:
Expand All @@ -946,8 +950,8 @@ def _win32_extension_command(extension):
return cmd[:-1].strip()
except WindowsError as e:
# Catch any key lookup errors
output('Unable to detect program for file extension "{0}": {1!r}'.format(
extension, e))
output('Unable to detect program for file extension "{0}": {1!r}'
.format(extension, e))


def _detect_win32_editor():
Expand Down
Loading