Skip to content

Commit

Permalink
Use upstream pathlib instead of packaged one
Browse files Browse the repository at this point in the history
  • Loading branch information
jbaiter committed Mar 27, 2015
1 parent a246d6f commit ad955a5
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 1,296 deletions.
2 changes: 1 addition & 1 deletion buildmsi.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import pkg_resources
from nsist import InstallerBuilder
from spreads.vendor.pathlib import Path
from pathlib import Path

import spreads

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ def run(self):
"psutil >= 2.0.0",
"isbnlib >= 3.3.8",
"enum34 >= 1.0.3",
"pathlib >= 1.0.1",
],
extras_require={
"chdkcamera": ["jpegtran-cffi >= 0.4", "chdkptp.py >= 0.1.2"],
Expand Down
2 changes: 1 addition & 1 deletion spreads/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import logging

import spreads.vendor.confit as confit
from spreads.vendor.pathlib import Path
from pathlib import Path

import spreads.util as util

Expand Down
2 changes: 1 addition & 1 deletion spreads/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import colorama
from spreads.vendor.confit import ConfigError
from spreads.vendor.pathlib import Path
from pathlib import Path

import spreads.cli as cli
import spreads.plugin as plugin
Expand Down
2 changes: 1 addition & 1 deletion spreads/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import psutil
import roman
from colorama import Fore, Back, Style
from spreads.vendor.pathlib import Path
from pathlib import Path


class SpreadsException(Exception):
Expand Down
Loading

0 comments on commit ad955a5

Please sign in to comment.