Storm

Merge lp:~cjwatson/storm/py3-repr into lp:storm

  1. py3-repr
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 512
Proposed branch: lp:~cjwatson/storm/py3-repr
Merge into: lp:storm
Diff against target: 77 lines (+9/-9)
1 file modified
storm/tz.py (+9/-9)
To merge this branch: bzr merge lp:~cjwatson/storm/py3-repr
Reviewer Review Type Date Requested Status
Kristian Glass (community) Approve
Storm Developers Pending
Review via email: mp+371124@code.launchpad.net

Commit message

Use Python 3-compatible repr syntax.

To post a comment you must log in.
Revision history for this message
Kristian Glass (doismellburning) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storm/tz.py'
2--- storm/tz.py 2019-08-09 13:09:09 +0000
3+++ storm/tz.py 2019-08-09 14:13:34 +0000
4@@ -76,8 +76,8 @@
5 return not self.__eq__(other)
6
7 def __repr__(self):
8- return "%s(%s, %s)" % (self.__class__.__name__,
9- `self._name`,
10+ return "%s(%r, %s)" % (self.__class__.__name__,
11+ self._name,
12 self._offset.days*86400+self._offset.seconds)
13
14 __reduce__ = object.__reduce__
15@@ -163,7 +163,7 @@
16 for attr in self.__slots__:
17 value = getattr(self, attr)
18 if value is not None:
19- l.append("%s=%s" % (attr, `value`))
20+ l.append("%s=%r" % (attr, value))
21 return "%s(%s)" % (self.__class__.__name__, ", ".join(l))
22
23 def __eq__(self, other):
24@@ -202,7 +202,7 @@
25 elif hasattr(fileobj, "name"):
26 self._filename = fileobj.name
27 else:
28- self._filename = `fileobj`
29+ self._filename = repr(fileobj)
30
31 # From tzfile(5):
32 #
33@@ -467,7 +467,7 @@
34
35
36 def __repr__(self):
37- return "%s(%s)" % (self.__class__.__name__, `self._filename`)
38+ return "%s(%r)" % (self.__class__.__name__, self._filename)
39
40 def __reduce__(self):
41 if not os.path.isfile(self._filename):
42@@ -617,7 +617,7 @@
43 return relativedelta.relativedelta(**kwargs)
44
45 def __repr__(self):
46- return "%s(%s)" % (self.__class__.__name__, `self._s`)
47+ return "%s(%r)" % (self.__class__.__name__, self._s)
48
49 class _tzicalvtzcomp:
50 def __init__(self, tzoffsetfrom, tzoffsetto, isdst,
51@@ -687,7 +687,7 @@
52 return self._find_comp(dt).tzname
53
54 def __repr__(self):
55- return "<tzicalvtz %s>" % `self._tzid`
56+ return "<tzicalvtz %r>" % self._tzid
57
58 __reduce__ = object.__reduce__
59
60@@ -703,7 +703,7 @@
61 elif hasattr(fileobj, "name"):
62 self._s = fileobj.name
63 else:
64- self._s = `fileobj`
65+ self._s = repr(fileobj)
66
67 self._vtz = {}
68
69@@ -861,7 +861,7 @@
70 invtz = True
71
72 def __repr__(self):
73- return "%s(%s)" % (self.__class__.__name__, `self._s`)
74+ return "%s(%r)" % (self.__class__.__name__, self._s)
75
76 if sys.platform != "win32":
77 TZFILES = ["/etc/localtime", "localtime"]

Subscribers

People subscribed via source and target branches

to status/vote changes: