Commit 155c23d

authored

method __str__ from UserAgent now using methods (#94)

Is better to calculate and provide a method to calculate the string values for `device`, `os` and `browser` instead of doing it directly on `__str__` method. This way the users may use those methods to get each data directly. Instead of having to make a `user_agent.__str__().split('/')` to get each value

1 parent 89ce57f commit 155c23dCopy full SHA for 155c23d

File tree

1 file changed

+15

-4

lines changed

user_agents
- parsers.py

1 file changed

+15

-4

lines changed

`‎user_agents/parsers.py`

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,11 @@ def __init__(self, user_agent_string):`
`140`	`140`	`self.device = parse_device(**ua_dict['device'])`
`141`	`141`
`142`	`142`	`def __str__(self):`
`143`		`- device = self.is_pc and "PC" or self.device.family`
`144`		`- os = ("%s %s" % (self.os.family, self.os.version_string)).strip()`
`145`		`- browser = ("%s %s" % (self.browser.family, self.browser.version_string)).strip()`
`146`		`- return " / ".join([device, os, browser])`
	`143`	`+ return "{device} / {os} / {browser}".format(`
	`144`	`+ device=self.get_device(),`
	`145`	`+ os=self.get_os(),`
	`146`	`+ browser=self.get_browser()`
	`147`	`+ )`
`147`	`148`
`148`	`149`	`def __unicode__(self):`
`149`	`150`	`return unicode(str(self))`
`@@ -167,6 +168,15 @@ def _is_blackberry_touch_capable_device(self):`
`167`	`168`	`return True`
`168`	`169`	`return False`
`169`	`170`
	`171`	`+ def get_device(self):`
	`172`	`+ return self.is_pc and "PC" or self.device.family`
	`173`	`+`
	`174`	`+ def get_os(self):`
	`175`	`+ return ("%s %s" % (self.os.family, self.os.version_string)).strip()`
	`176`	`+`
	`177`	`+ def get_browser(self):`
	`178`	`+ return ("%s %s" % (self.browser.family, self.browser.version_string)).strip()`
	`179`	`+`
`170`	`180`	`@property`
`171`	`181`	`def is_tablet(self):`
`172`	`182`	`if self.device.family in TABLET_DEVICE_FAMILIES:`
`@@ -255,5 +265,6 @@ def is_email_client(self):`
`255`	`265`	`return True`
`256`	`266`	`return False`
`257`	`267`
	`268`	`+`
`258`	`269`	`def parse(user_agent_string):`
`259`	`270`	`return UserAgent(user_agent_string)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 155c23d

File tree

1 file changed

1 file changed

`‎user_agents/parsers.py`

0 commit comments